From fc554d6f37e8ba4c869f019677d8d98da6907e41 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 8 Nov 2024 03:26:39 +0000
Subject: [PATCH 1/3] Bump golang from 1.23.2-alpine to 1.23.3-alpine

Bumps golang from 1.23.2-alpine to 1.23.3-alpine.

---
updated-dependencies:
- dependency-name: golang
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 813895f11..78016ec7b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23.2-alpine AS rcon-cli_builder
+FROM golang:1.23.3-alpine AS rcon-cli_builder
 
 ARG RCON_VERSION="0.10.3"
 ARG RCON_TGZ_SHA1SUM=33ee8077e66bea6ee097db4d9c923b5ed390d583

From a0985b9335e6b12a6d37f951e9f8c499b22f55b3 Mon Sep 17 00:00:00 2001
From: Dashboy1998 <18587674+Dashboy1998@users.noreply.github.com>
Date: Sun, 17 Nov 2024 03:15:37 -0500
Subject: [PATCH 2/3] Updated restore.sh to move Palworld backup folder during
 restore

---
 scripts/restore.sh | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/scripts/restore.sh b/scripts/restore.sh
index 186b0b1ce..216f020dd 100644
--- a/scripts/restore.sh
+++ b/scripts/restore.sh
@@ -109,6 +109,19 @@ if [ -f "$BACKUP_FILE" ]; then
             # Decompress the backup file in tmp directory
             tar -zxvf "$BACKUP_FILE" -C "$TMP_PATH"
 
+            # Find backup folders
+            mapfile -t backup_folders < <(find "$RESTORE_PATH" -name "backup" -type d | sed "s|^$RESTORE_PATH||")
+
+            # Check if backup folder parents exist in restore
+            for backup_folder in "${backup_folders[@]}"
+            do
+                backup_folder_dirname=$( dirname "$backup_folder" )
+                if [ -d "$TMP_PATH/$backup_folder_dirname" ]; then
+                    # Move backup folder into restore
+                    mv "$RESTORE_PATH/$backup_folder_dirname/backup" "$TMP_PATH/$backup_folder_dirname"
+                fi
+            done
+
             # Make sure Saves with a different ID are removed before restoring the save
             rm -rf "$RESTORE_PATH/Saved/"
 

From 99ed74cf5a4fe6ffc9ebbbcf32f74ec92d1710c2 Mon Sep 17 00:00:00 2001
From: Thijs van Loef <thijsvanloef@gmail.com>
Date: Sun, 17 Nov 2024 20:46:04 +0100
Subject: [PATCH 3/3] update arm to resolve steamcmd issue

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 813895f11..ea3ac64af 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,7 +20,7 @@ RUN wget -q https://github.com/gorcon/rcon-cli/archive/refs/tags/v${RCON_VERSION
 FROM cm2network/steamcmd:root AS base-amd64
 # Ignoring --platform=arm64 as this is required for the multi-arch build to continue to work on amd64 hosts
 # hadolint ignore=DL3029
-FROM --platform=arm64 sonroyaalmerol/steamcmd-arm64:root-2024-10-20 AS base-arm64
+FROM --platform=arm64 sonroyaalmerol/steamcmd-arm64:root-2024-11-17 AS base-arm64
 
 ARG TARGETARCH
 # Ignoring the lack of a tag here because the tag is defined in the above FROM lines