Merge pull request #35 from jsknnr/dev

still not quite right, trying this method instead
jsknnr · Jan 26, 2024 · 0a66bee · 0a66bee
2 parents b7a2a6b + 668dac1
commit 0a66bee
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ Run Enshrouded dedicated server in a container. Optionally includes helm chart f
 
 The processes within the container do **NOT** run as root. Everything runs as the user steam (gid:10000/uid:10000 by default). If you exec into the container, you will drop into `/home/steam` as the steam user. Enshrouded will be installed to `/home/steam/enshrouded`. Any persistent volumes should be mounted to `/home/steam/enshrouded/savegame` and be owned by 10000:10000. 
 
-In all of the examples below the image tag is set to `v2.0.2` which is the current latest release. I will update the examples each time I cut a new release. This is to avoid forcing potentially breaking changes if your tag is set to `latest` and you always pull. Please review my release notes for each version between your current and your target before upgrading.
+In all of the examples below the image tag is set to `v2.0.4` which is the current latest release. I will update the examples each time I cut a new release. This is to avoid forcing potentially breaking changes if your tag is set to `latest` and you always pull. Please review my release notes for each version between your current and your target before upgrading.
 
 ### Ports
 
@@ -49,7 +49,7 @@ docker run \
   --env=SERVER_PASSWORD='ChangeThisPlease' \
   --env=GAME_PORT=15636 \
   --env=QUERY_PORT=15637 \
-  sknnr/enshrouded-dedicated-server:v2.0.2
+  sknnr/enshrouded-dedicated-server:v2.0.4
 ```
 
 ### Docker Compose
@@ -70,7 +70,7 @@ compose.yaml file:
 ```yaml
 services:
   enshrouded:
-    image: sknnr/enshrouded-dedicated-server:v2.0.2
+    image: sknnr/enshrouded-dedicated-server:v2.0.4
     ports:
       - "15636:15636/udp"
       - "15637:15637/udp"
@@ -109,7 +109,7 @@ podman run \
   --env=SERVER_PASSWORD='ChangeThisPlease' \
   --env=GAME_PORT=15636 \
   --env=QUERY_PORT=15637 \
-  docker.io/sknnr/enshrouded-dedicated-server:v2.0.2
+  docker.io/sknnr/enshrouded-dedicated-server:v2.0.4
 ```
 
 ### Kubernetes

diff --git a/container/compose.yaml b/container/compose.yaml
@@ -1,6 +1,6 @@
 services:
   enshrouded:
-    image: sknnr/enshrouded-dedicated-server:v2.0.2
+    image: sknnr/enshrouded-dedicated-server:v2.0.4
     ports:
       - "15636:15636/udp"
       - "15637:15637/udp"

diff --git a/container/entrypoint.sh b/container/entrypoint.sh
@@ -62,12 +62,12 @@ rm "${ENSHROUDED_PATH}/savegame/test"
 # Modify server config to match our arguments
 echo "INFO: Updating Enshrouded Server configuration"
 tmpfile=$(mktemp)
-jq --argjson n "$SERVER_NAME" '.name = $n' ${ENSHROUDED_CONFIG} > "$tmpfile" && mv "$tmpfile" $ENSHROUDED_CONFIG
-jq --argjson p "$SERVER_PASSWORD" '.password = $p' ${ENSHROUDED_CONFIG} > "$tmpfile" && mv "$tmpfile" $ENSHROUDED_CONFIG
-jq --argjson g "$GAME_PORT" '.gamePort = $g' ${ENSHROUDED_CONFIG} > "$tmpfile" && mv "$tmpfile" $ENSHROUDED_CONFIG
-jq --argjson q "$QUERY_PORT" '.queryPort = $q' ${ENSHROUDED_CONFIG} > "$tmpfile" && mv "$tmpfile" $ENSHROUDED_CONFIG
-jq --argjson s "$SERVER_SLOTS" '.slotCount = $s' ${ENSHROUDED_CONFIG} > "$tmpfile" && mv "$tmpfile" $ENSHROUDED_CONFIG
-jq --argjson i "$SERVER_IP" '.ip = $i' ${ENSHROUDED_CONFIG} > "$tmpfile" && mv "$tmpfile" $ENSHROUDED_CONFIG
+jq --arg n "$SERVER_NAME" '.name = $n' ${ENSHROUDED_CONFIG} > "$tmpfile" && mv "$tmpfile" $ENSHROUDED_CONFIG
+jq --arg p "$SERVER_PASSWORD" '.password = $p' ${ENSHROUDED_CONFIG} > "$tmpfile" && mv "$tmpfile" $ENSHROUDED_CONFIG
+jq --arg g "$GAME_PORT" '.gamePort = ($g | tonumber)' ${ENSHROUDED_CONFIG} > "$tmpfile" && mv "$tmpfile" $ENSHROUDED_CONFIG
+jq --arg q "$QUERY_PORT" '.queryPort = ($q | tonumber)' ${ENSHROUDED_CONFIG} > "$tmpfile" && mv "$tmpfile" $ENSHROUDED_CONFIG
+jq --arg s "$SERVER_SLOTS" '.slotCount = ($s | tonumber)' ${ENSHROUDED_CONFIG} > "$tmpfile" && mv "$tmpfile" $ENSHROUDED_CONFIG
+jq --arg i "$SERVER_IP" '.ip = $i' ${ENSHROUDED_CONFIG} > "$tmpfile" && mv "$tmpfile" $ENSHROUDED_CONFIG
 
 # Wine talks too much and it's annoying
 export WINEDEBUG=-all

diff --git a/helm/values.yaml b/helm/values.yaml
@@ -1,5 +1,5 @@
 image: sknnr/enshrouded-dedicated-server
-imageTag: v2.0.2
+imageTag: v2.0.4
 # serviceType should be LoadBalancer or NodePort
 serviceType: LoadBalancer
 resources: