From 675954443b6e277721424fe2bf72414ec534d285 Mon Sep 17 00:00:00 2001 From: 43414d <116867332+43414d@users.noreply.github.com> Date: Thu, 29 Feb 2024 00:26:40 -0600 Subject: [PATCH 1/5] Remove -rcon arg statement -rcon is no longer needed as of the 1.5.1 fix, seems like it was bugged in 1.5.0 and not pulling correctly from config --- scripts/start.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/start.sh b/scripts/start.sh index 4acfdf3af..6d88a77ee 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -81,10 +81,6 @@ if [ "${MULTITHREADING,,}" = true ]; then STARTCOMMAND+=("-useperfthreads" "-NoAsyncLoadingThread" "-UseMultithreadForDS") fi -if [ "${RCON_ENABLED,,}" = true ]; then - STARTCOMMAND+=("-rcon") -fi - if [ "${DISABLE_GENERATE_SETTINGS,,}" = true ]; then LogAction "GENERATING CONFIG" LogWarn "Env vars will not be applied due to DISABLE_GENERATE_SETTINGS being set to TRUE!" From b05473c6d35bf01f81e595caad613e2f6d085bd4 Mon Sep 17 00:00:00 2001 From: Drew Morrison <43414d@gmail.com> Date: Fri, 1 Mar 2024 01:13:26 -0600 Subject: [PATCH 2/5] rcon legacy fix for v0.1.5.0 --- Dockerfile | 6 +++--- docker-compose.yml | 2 +- scripts/start.sh | 5 +++++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5c8358231..9d4f29df4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,11 +28,11 @@ ARG TARGETARCH # hadolint ignore=DL3006 FROM base-${TARGETARCH} -LABEL maintainer="thijs@loef.dev" \ - name="thijsvanloef/palworld-server-docker" \ +LABEL maintainer="43414d@gmail.com" \ + name="43414d/palworld-server-docker" \ github="https://github.com/thijsvanloef/palworld-server-docker" \ dockerhub="https://hub.docker.com/r/thijsvanloef/palworld-server-docker" \ - org.opencontainers.image.authors="Thijs van Loef" \ + org.opencontainers.image.authors="43414d" \ org.opencontainers.image.source="https://github.com/thijsvanloef/palworld-server-docker" # set envs diff --git a/docker-compose.yml b/docker-compose.yml index da115d291..87b04a81a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ --- services: palworld: - image: thijsvanloef/palworld-server-docker:latest + image: 43414d/palworld-server-docker:latest restart: unless-stopped container_name: palworld-server stop_grace_period: 30s # Set to however long you are willing to wait for the container to gracefully stop diff --git a/scripts/start.sh b/scripts/start.sh index 6d88a77ee..977ecc11a 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -81,6 +81,11 @@ if [ "${MULTITHREADING,,}" = true ]; then STARTCOMMAND+=("-useperfthreads" "-NoAsyncLoadingThread" "-UseMultithreadForDS") fi +# fix bug and enable rcon for v0.1.5.0 only +if [ "${TARGET_MANIFEST_ID}" == "3750364703337203431"] && [-a "${RCON_ENABLED,,}" = true ]; then + STARTCOMMAND+=("-rcon") +fi + if [ "${DISABLE_GENERATE_SETTINGS,,}" = true ]; then LogAction "GENERATING CONFIG" LogWarn "Env vars will not be applied due to DISABLE_GENERATE_SETTINGS being set to TRUE!" From 1eb28fb6b576909923073ea3f47c1dc3ac56cbba Mon Sep 17 00:00:00 2001 From: Drew Morrison <43414d@gmail.com> Date: Fri, 1 Mar 2024 01:16:11 -0600 Subject: [PATCH 3/5] revert to original files --- Dockerfile | 6 +++--- docker-compose.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9d4f29df4..5c8358231 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,11 +28,11 @@ ARG TARGETARCH # hadolint ignore=DL3006 FROM base-${TARGETARCH} -LABEL maintainer="43414d@gmail.com" \ - name="43414d/palworld-server-docker" \ +LABEL maintainer="thijs@loef.dev" \ + name="thijsvanloef/palworld-server-docker" \ github="https://github.com/thijsvanloef/palworld-server-docker" \ dockerhub="https://hub.docker.com/r/thijsvanloef/palworld-server-docker" \ - org.opencontainers.image.authors="43414d" \ + org.opencontainers.image.authors="Thijs van Loef" \ org.opencontainers.image.source="https://github.com/thijsvanloef/palworld-server-docker" # set envs diff --git a/docker-compose.yml b/docker-compose.yml index 87b04a81a..da115d291 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ --- services: palworld: - image: 43414d/palworld-server-docker:latest + image: thijsvanloef/palworld-server-docker:latest restart: unless-stopped container_name: palworld-server stop_grace_period: 30s # Set to however long you are willing to wait for the container to gracefully stop From dab12eb29e8c7edcf05a0e1b0197c1ad3529ed73 Mon Sep 17 00:00:00 2001 From: Drew Morrison <43414d@gmail.com> Date: Fri, 1 Mar 2024 01:19:46 -0600 Subject: [PATCH 4/5] lint fix --- scripts/start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/start.sh b/scripts/start.sh index 977ecc11a..335f01af0 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -82,7 +82,7 @@ if [ "${MULTITHREADING,,}" = true ]; then fi # fix bug and enable rcon for v0.1.5.0 only -if [ "${TARGET_MANIFEST_ID}" == "3750364703337203431"] && [-a "${RCON_ENABLED,,}" = true ]; then +if [ "${TARGET_MANIFEST_ID}" == "3750364703337203431" ] && [ "${RCON_ENABLED,,}" = true ]; then STARTCOMMAND+=("-rcon") fi From 3dbf063cc888a49e357d0a760eb8111370d1ec4c Mon Sep 17 00:00:00 2001 From: Thijs van Loef Date: Fri, 1 Mar 2024 10:13:24 +0100 Subject: [PATCH 5/5] also update manifest id's --- README.md | 1 + docusaurus/docs/guides/pinning-game-version.md | 1 + 2 files changed, 2 insertions(+) diff --git a/README.md b/README.md index a8e8c95f6..3517fbcb0 100644 --- a/README.md +++ b/README.md @@ -543,6 +543,7 @@ The manifest corresponds to the release date/update versions. Manifests can be f | 1.4.0 | 4190579964382773830 | | 1.4.1 | 6370735655629434989 | | 1.5.0 | 3750364703337203431 | +| 1.5.1 | 2815085007637542021 | ## Reporting Issues/Feature Requests diff --git a/docusaurus/docs/guides/pinning-game-version.md b/docusaurus/docs/guides/pinning-game-version.md index 4d60aef9b..abdafc3e9 100644 --- a/docusaurus/docs/guides/pinning-game-version.md +++ b/docusaurus/docs/guides/pinning-game-version.md @@ -21,3 +21,4 @@ The manifest corresponds to the release date/update versions. Manifests can be f | 1.4.0 | 4190579964382773830 | | 1.4.1 | 6370735655629434989 | | 1.5.0 | 3750364703337203431 | +| 1.5.1 | 2815085007637542021 |