From cd937ecb688a7ce50b8a7f7c34c8d5726d52e998 Mon Sep 17 00:00:00 2001
From: thelamer <ryankuba@gmail.com>
Date: Tue, 28 Mar 2023 13:45:05 -0700
Subject: [PATCH] pin docker compose to upstream reccomended version

---
 Dockerfile         | 7 ++++++-
 Dockerfile.aarch64 | 7 ++++++-
 README.md          | 1 +
 readme-vars.yml    | 1 +
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index fabd234..1b74a9e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -34,7 +34,6 @@ RUN \
     containerd.io \
     docker-ce \
     docker-ce-cli \
-    docker-compose-plugin \
     drm-info \
     e2fsprogs \
     fuse-overlayfs \
@@ -51,6 +50,12 @@ RUN \
     sudo \
     uidmap \
     xfsprogs && \
+  echo "**** compose install ****" && \
+  mkdir -p /usr/local/lib/docker/cli-plugins && \
+  curl -L \
+    https://github.com/docker/compose/releases/download/v2.5.0/docker-compose-$(uname -s)-$(uname -m) -o \
+    /usr/local/lib/docker/cli-plugins/docker-compose && \
+  chmod +x /usr/local/lib/docker/cli-plugins/docker-compose && \
   echo "**** dind setup ****" && \
   useradd -U dockremap && \
   usermod -G dockremap dockremap && \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index c53e41c..1170316 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -34,7 +34,6 @@ RUN \
     containerd.io \
     docker-ce \
     docker-ce-cli \
-    docker-compose-plugin \
     drm-info \
     e2fsprogs \
     fuse-overlayfs \
@@ -51,6 +50,12 @@ RUN \
     sudo \
     uidmap \
     xfsprogs && \
+  echo "**** compose install ****" && \
+  mkdir -p /usr/local/lib/docker/cli-plugins && \
+  curl -L \
+    https://github.com/docker/compose/releases/download/v2.5.0/docker-compose-$(uname -s)-$(uname -m) -o \
+    /usr/local/lib/docker/cli-plugins/docker-compose && \
+  chmod +x /usr/local/lib/docker/cli-plugins/docker-compose && \
   echo "**** dind setup ****" && \
   useradd -U dockremap && \
   usermod -G dockremap dockremap && \
diff --git a/README.md b/README.md
index 87db2b8..9659a04 100644
--- a/README.md
+++ b/README.md
@@ -261,6 +261,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **28.03.23:** - Pin compose to 2.5.0 to be in sync with upstream requirements.
 * **05.11.22:** - Rebase to Jammy, add support for GPUs, add support for Gamepads.
 * **23.09.22:** - Migrate to s6v3.
 * **02.07.22:** - Initial Release.
diff --git a/readme-vars.yml b/readme-vars.yml
index ca5ffb5..5ec1b6b 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -105,6 +105,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "28.03.23:", desc: "Pin compose to 2.5.0 to be in sync with upstream requirements." }
   - { date: "05.11.22:", desc: "Rebase to Jammy, add support for GPUs, add support for Gamepads." }
   - { date: "23.09.22:", desc: "Migrate to s6v3." }
   - { date: "02.07.22:", desc: "Initial Release." }