From 66286f5db2f55ec5f24cb6768821b6542d95277e Mon Sep 17 00:00:00 2001 From: Thijs van Loef Date: Wed, 26 Jun 2024 10:04:42 +0200 Subject: [PATCH 1/2] Add support for installing the latest Beta version of the Palworld dedicated server --- Dockerfile | 3 ++- README.md | 1 + .../configuration/server-settings.md | 1 + scripts/helper_install.sh | 13 ++++++++++++- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f561a0e99..dbbef8b38 100644 --- a/Dockerfile +++ b/Dockerfile @@ -145,7 +145,8 @@ ENV HOME=/home/steam \ ENABLE_PLAYER_LOGGING=true \ PLAYER_LOGGING_POLL_PERIOD=5 \ ARM_COMPATIBILITY_MODE=false \ - DISABLE_GENERATE_ENGINE=true + DISABLE_GENERATE_ENGINE=true \ + INSTALL_BETA_INSIDER=false # Passed from Github Actions ARG GIT_VERSION_TAG=unspecified diff --git a/README.md b/README.md index 3a6bf7058..d56747fc8 100644 --- a/README.md +++ b/README.md @@ -238,6 +238,7 @@ It is highly recommended you set the following environment values before startin | AUTO_REBOOT_WARN_MINUTES | How long to wait to reboot the server, after the player were informed. | 5 | Integer | 0.21.0 | | AUTO_REBOOT_EVEN_IF_PLAYERS_ONLINE | Restart the Server even if there are players online. | false | true/false | 0.21.0 | | TARGET_MANIFEST_ID | Locks game version to corespond with Manifest ID from Steam Download Depot. | | See [Manifest ID Table](#locking-specific-game-version) | 0.27.0 | +| INSTALL_BETA_INSIDER | Installs the latest Beta version of the Palworld dedicated server | false | true/false | 0.38.0 | | DISCORD_WEBHOOK_URL | Discord webhook url found after creating a webhook on a discord server. | | `https://discord.com/api/webhooks/` | 0.22.0 | | DISCORD_SUPPRESS_NOTIFICATIONS | Enables/Disables `@silent` messages for the server messages. | false | boolean | 0.34.0 | | DISCORD_CONNECT_TIMEOUT | Discord command initial connection timeout | 30 | !0 | 0.22.0 | diff --git a/docusaurus/docs/getting-started/configuration/server-settings.md b/docusaurus/docs/getting-started/configuration/server-settings.md index bb0d2c76c..90ee62e2d 100644 --- a/docusaurus/docs/getting-started/configuration/server-settings.md +++ b/docusaurus/docs/getting-started/configuration/server-settings.md @@ -56,6 +56,7 @@ It is highly recommended you set the following environment values before startin | AUTO_REBOOT_WARN_MINUTES | How long to wait to reboot the server, after the player were informed. | 5 | Integer | 0.21.0 | | AUTO_REBOOT_EVEN_IF_PLAYERS_ONLINE | Restart the Server even if there are players online. | false | true/false | 0.21.0 | | TARGET_MANIFEST_ID | Locks game version to corespond with Manfiest ID from Steam Download Depot. | | See [Manifest ID Table](https://palworld-server-docker.loef.dev/guides/pinning-game-version#version-to-manifest-id-table) | 0.27.0 | +| INSTALL_BETA_INSIDER | Installs the latest Beta version of the Palworld dedicated server | false | true/false | 0.38.0 | | DISCORD_WEBHOOK_URL | Discord webhook url found after creating a webhook on a discord server | | `https://discord.com/api/webhooks/` | 0.22.0 | | DISCORD_SUPPRESS_NOTIFICATIONS | Enables/Disables `@silent` messages for the server messages. | false | boolean | 0.34.0 | | DISCORD_CONNECT_TIMEOUT | Discord command initial connection timeout | 30 | !0 | 0.22.0 | diff --git a/scripts/helper_install.sh b/scripts/helper_install.sh index 19021bb5f..46dc92273 100644 --- a/scripts/helper_install.sh +++ b/scripts/helper_install.sh @@ -90,6 +90,11 @@ UpdateRequired() { updateAvailable=true fi + # If INSTALL_BETA_INSIDER is set to true, install the latest beta version + if [ "${INSTALL_BETA_INSIDER}" == true ]; then + return 0 + fi + # No TARGET_MANIFEST_ID env set & update needed if [ "$updateAvailable" == true ] && [ -z "${TARGET_MANIFEST_ID}" ]; then return 0 @@ -126,7 +131,13 @@ InstallServer() { if [ -z "${TARGET_MANIFEST_ID}" ]; then DiscordMessage "Install" "${DISCORD_PRE_UPDATE_BOOT_MESSAGE}" "in-progress" "${DISCORD_PRE_UPDATE_BOOT_MESSAGE_ENABLED}" "${DISCORD_PRE_UPDATE_BOOT_MESSAGE_URL}" - /home/steam/steamcmd/steamcmd.sh +@sSteamCmdForcePlatformType linux +@sSteamCmdForcePlatformBitness 64 +force_install_dir "/palworld" +login anonymous +app_update 2394010 validate +quit + ## If INSTALL_BETA_INSIDER is set to true, install the latest beta version + if [ "${INSTALL_BETA_INSIDER}" == true ]; then + LogWarn "Installing latest beta version" + /home/steam/steamcmd/steamcmd.sh +@sSteamCmdForcePlatformType linux +@sSteamCmdForcePlatformBitness 64 +force_install_dir "/palworld" +login anonymous +app_update 2394010 -beta insiderprogram validate +quit + else + /home/steam/steamcmd/steamcmd.sh +@sSteamCmdForcePlatformType linux +@sSteamCmdForcePlatformBitness 64 +force_install_dir "/palworld" +login anonymous +app_update 2394010 validate +quit + fi DiscordMessage "Install" "${DISCORD_POST_UPDATE_BOOT_MESSAGE}" "success" "${DISCORD_POST_UPDATE_BOOT_MESSAGE_ENABLED}" "${DISCORD_POST_UPDATE_BOOT_MESSAGE_URL}" return fi From accdfc869bf06087b637d166944192c4c542d7c6 Mon Sep 17 00:00:00 2001 From: Thijs van Loef Date: Wed, 26 Jun 2024 10:13:30 +0200 Subject: [PATCH 2/2] add to .env.example --- .env.example | 1 + 1 file changed, 1 insertion(+) diff --git a/.env.example b/.env.example index bc5c01a3f..f9b732759 100644 --- a/.env.example +++ b/.env.example @@ -87,3 +87,4 @@ REST_API_PORT=8212 SHOW_PLAYER_LIST=True ALLOW_CONNECT_PLATFORM=Steam USE_BACKUP_SAVE_DATA=True +INSTALL_BETA_INSIDER=False