Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #43

Merged
merged 2 commits into from
Jan 31, 2024
Merged

Dev #43

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/publish_image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
with:
image: enshrouded-dedicated-server
context: ./container/wine
containerfiles: ./container/wine/Containerfile
containerfiles: ./container/wine/Dockerfile
tags: latest ${{ github.event.release.tag_name }} # Use latest and the release tag
- name: Push image to Docker Hub
uses: redhat-actions/push-to-registry@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish_proton_image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ jobs:
with:
image: enshrouded-dedicated-server
context: ./container/proton
containerfiles: ./container/proton/Containerfile
tags: proton-latest
containerfiles: ./container/proton/Dockerfile
tags: proton-latest
- name: Push image to Docker Hub
uses: redhat-actions/push-to-registry@v2
with:
Expand Down
File renamed without changes.
6 changes: 5 additions & 1 deletion container/wine/Containerfile → container/wine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@ RUN groupadd -g $CONTAINER_GID steam \
&& apt-get update \
&& apt-get install -y --install-recommends winehq-stable \
&& wget -O /usr/local/bin/winetricks https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks \
&& chmod +x /usr/local/bin/winetricks
&& chmod +x /usr/local/bin/winetricks \
&& rm -rf /var/lib/apt/lists/* \
&& apt-get clean \
&& apt-get autoremove -y


USER steam

Expand Down
7 changes: 7 additions & 0 deletions helm/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,17 @@ spec:
matchLabels:
app: "{{ .Chart.Name }}"
release: "{{ .Release.Name }}"
securityContext:
runAsNonRoot: true
template:
metadata:
labels:
app: "{{ .Chart.Name }}"
release: "{{ .Release.Name }}"
spec:
securityContext:
runAsUser: 10000
runAsGroup: 10000
fsGroup: 10000
containers:
- name: "{{ .Chart.Name }}"
Expand Down Expand Up @@ -50,6 +54,9 @@ spec:
volumeMounts:
- name: data
mountPath: /home/steam/enshrouded/savegame
securityContext:
allowPrivilegeEscalation: false

volumes:
- name: data
persistentVolumeClaim:
Expand Down
5 changes: 4 additions & 1 deletion makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
# Image values
# I would prefer Podman but for some reason the Proton container just doesn't run right in Podman.
# Not sure if this is a me problem or a Podman problem. So Proton builds and runs with Docker instead.
#
# Image Values
REGISTRY := localhost
IMAGE := enshrouded-test
PROTON_IMAGE := enshrouded-proton-test
Expand Down