From abfd9fa5dd9adec0d1f180a6fbaf191948c0a2ef Mon Sep 17 00:00:00 2001 From: Son Roy Almerol Date: Wed, 18 Dec 2024 20:16:57 -0500 Subject: [PATCH 1/2] retry downloading with DepotDownloader on steamcmd failure --- Dockerfile | 2 +- scripts/start.sh | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8a54e867b..b853c5ca2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -43,7 +43,7 @@ LABEL maintainer="thijs@loef.dev" \ ARG SUPERCRONIC_SHA1SUM_ARM64="e0f0c06ebc5627e43b25475711e694450489ab00 " ARG SUPERCRONIC_SHA1SUM_AMD64="71b0d58cc53f6bd72cf2f293e09e294b79c666d8 " ARG SUPERCRONIC_VERSION="0.2.33" -ARG DEPOT_DOWNLOADER_VERSION="2.7.3" +ARG DEPOT_DOWNLOADER_VERSION="2.7.4" # update and install dependencies # hadolint ignore=DL3008 diff --git a/scripts/start.sh b/scripts/start.sh index 0982ba97f..453bcde7d 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -36,6 +36,12 @@ fi # Check if the architecture is arm64 if [ "$architecture" == "arm64" ]; then # create an arm64 version of ./PalServer.sh + if ! fileExists "./PalServer.sh" && [ "${USE_DEPOT_DOWNLOADER,,}" != true ]; then + LogAction "SteamCMD failed to download the server properly, attempting to use DepotDownloader." + export USE_DEPOT_DOWNLOADER=true + InstallServer + fi + cp ./PalServer.sh ./PalServer-arm64.sh sed -i "s|\(\"\$UE_PROJECT_ROOT\/Pal\/Binaries\/Linux\/PalServer-Linux-Shipping\" Pal \"\$@\"\)|LD_LIBRARY_PATH=/home/steam/steamcmd/linux64:\$LD_LIBRARY_PATH /usr/local/bin/box64 \1|" ./PalServer-arm64.sh From 4b365be5626fb4b9cb0057904324245ce630e96b Mon Sep 17 00:00:00 2001 From: Son Roy Almerol Date: Wed, 18 Dec 2024 20:31:35 -0500 Subject: [PATCH 2/2] switch to LogInfo and unset env var after installation for consistency --- scripts/start.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/start.sh b/scripts/start.sh index 453bcde7d..f26abec11 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -37,9 +37,12 @@ fi if [ "$architecture" == "arm64" ]; then # create an arm64 version of ./PalServer.sh if ! fileExists "./PalServer.sh" && [ "${USE_DEPOT_DOWNLOADER,,}" != true ]; then - LogAction "SteamCMD failed to download the server properly, attempting to use DepotDownloader." + LogInfo "SteamCMD failed to download the server properly, attempting to use DepotDownloader." export USE_DEPOT_DOWNLOADER=true InstallServer + + # reset env var after installation + unset USE_DEPOT_DOWNLOADER fi cp ./PalServer.sh ./PalServer-arm64.sh