From 37c349fdd9dd1213027529b709e3211d1e3ef096 Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Sun, 19 May 2024 16:56:32 -0500
Subject: [PATCH 1/3] build: removing git-lfs until it fixes CVEs

---
 Dockerfile                       | 8 +++-----
 build/alpine/install-packages.sh | 1 -
 build/ol/install-packages.sh     | 1 -
 build/ubuntu/install-packages.sh | 1 -
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ea3c13cb9b1..1aeaa6e5868 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,14 +9,12 @@ ARG TARGETOS
 ARG TARGETARCH
 ARG TARGETVARIANT
 
-# CI system should set this to a hash or git revision of the build directory and it's contents to
-# ensure consistent cache updates.
-ARG BUILD_FILES_REV=1
+ARG FORCE_INSTALL_PACKAGES=1
 RUN --mount=target=/build,source=build \
-    REV=${BUILD_FILES_REV} TARGET=${TARGETARCH}${TARGETVARIANT} /build/run.sh install-packages
+    TARGET=${TARGETARCH}${TARGETVARIANT} /build/run.sh install-packages
 
 RUN --mount=target=/build,source=build \
-    REV=${BUILD_FILES_REV} /build/run.sh setup-user
+    /build/run.sh setup-user
 
 COPY --chmod=644 files/sudoers* /etc/sudoers.d
 
diff --git a/build/alpine/install-packages.sh b/build/alpine/install-packages.sh
index 24bba090819..ebafe04169a 100755
--- a/build/alpine/install-packages.sh
+++ b/build/alpine/install-packages.sh
@@ -16,7 +16,6 @@ apk add --no-cache -U \
     bash \
     curl iputils \
     git \
-    git-lfs \
     jq \
     mysql-client \
     tzdata \
diff --git a/build/ol/install-packages.sh b/build/ol/install-packages.sh
index f216662e9b8..b8b27f673c5 100755
--- a/build/ol/install-packages.sh
+++ b/build/ol/install-packages.sh
@@ -25,7 +25,6 @@ dnf install -y ImageMagick \
   iputils \
   curl \
   git \
-  git-lfs \
   jq \
   dos2unix \
   mysql \
diff --git a/build/ubuntu/install-packages.sh b/build/ubuntu/install-packages.sh
index 134ad025450..aea8111f756 100755
--- a/build/ubuntu/install-packages.sh
+++ b/build/ubuntu/install-packages.sh
@@ -16,7 +16,6 @@ apt-get install -y \
   iputils-ping \
   curl \
   git \
-  git-lfs \
   jq \
   dos2unix \
   mysql-client \

From efd48568ba3e307047bfc319b658e1bd03d40c4f Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Sun, 19 May 2024 16:59:25 -0500
Subject: [PATCH 2/3] Upgrade rcon-cli

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

diff --git a/Dockerfile b/Dockerfile
index 1aeaa6e5868..73bdce9dbfe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -32,7 +32,7 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
   --var version=${RESTIFY_VERSION} --var app=restify --file {{.app}} \
   --from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
 
-ARG RCON_CLI_VERSION=1.6.4
+ARG RCON_CLI_VERSION=1.6.6
 RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
   --var version=${RCON_CLI_VERSION} --var app=rcon-cli --file {{.app}} \
   --from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz

From 086261d0b086010a933e9340151856fe05ca404b Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Sun, 19 May 2024 17:00:01 -0500
Subject: [PATCH 3/3] Upgrade easy-add

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

diff --git a/Dockerfile b/Dockerfile
index 73bdce9dbfe..0f92e17e1de 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,7 +23,7 @@ EXPOSE 25565
 ARG APPS_REV=1
 ARG GITHUB_BASEURL=https://github.com
 
-ARG EASY_ADD_VERSION=0.8.4
+ARG EASY_ADD_VERSION=0.8.5
 ADD ${GITHUB_BASEURL}/itzg/easy-add/releases/download/${EASY_ADD_VERSION}/easy-add_${TARGETOS}_${TARGETARCH}${TARGETVARIANT} /usr/bin/easy-add
 RUN chmod +x /usr/bin/easy-add