ci: use docker hub as source for docker-compose binary

legobeat · Aug 16, 2024 · 69922ab · 69922ab
1 parent d697cad
commit 69922ab
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -502,6 +502,8 @@ jobs:
             build-args: |
               BASE_IMAGE=ghcr.io/legobeat/l7-devenv/vnc:ratpoison-${{ github.ref_name }}
               CADDY_IMAGE=ghcr.io/legobeat/l7-devenv/caddy:${{ github.ref_name }}
+              COMPOSE_BUILD_IMAGE=docker.io/docker/compose-bin:v2.29.2
+              COMPOSE_BUILD_PATH=/docker-compose
           - name: dev-terminal-xterm
             file: imags/X11/dev-terminal/Containerfile
             context: .
@@ -511,6 +513,8 @@ jobs:
             build-args: |
               BASE_IMAGE=ghcr.io/legobeat/l7-devenv/xterm:ratpoison-${{ github.ref_name }}
               CADDY_IMAGE=ghcr.io/legobeat/l7-devenv/caddy:${{ github.ref_name }}
+              COMPOSE_BUILD_IMAGE=docker.io/docker/compose-bin:v2.29.2
+              COMPOSE_BUILD_PATH=/docker-compose
     steps:
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3

diff --git a/imags/X11/dev-terminal/Containerfile b/imags/X11/dev-terminal/Containerfile
@@ -3,12 +3,14 @@ ARG BASE_IMAGE="localhost/l7/xterm:podman-remote"
 FROM ${BASE_IMAGE}
 
 ARG COMPOSE_BUILD_IMAGE="localhost/docker-compose:latest"
+FROM COMPOSE_BUILD_IMAGE AS compose_base
 ARG TARGETOS=linux
 
 #ARG TARGETARCH=x86_64
 #COPY --from=${COMPOSE_BUILD_IMAGE} /docker-compose-${TARGETOS}-${TARGETARCH} /usr/local/bin/docker-compose
 ARG COMPOSE_TARGETARCH=x86_64
-COPY --from=${COMPOSE_BUILD_IMAGE} /docker-compose-${TARGETOS}-${COMPOSE_TARGETARCH} /usr/local/bin/docker-compose
+ARG COMPOSE_BUILD_PATH=/docker-compose-${TARGETOS}-${COMPOSE_TARGETARCH}
+COPY --from=compose_base ${COMPOSE_BUILD_PATH} /usr/local/bin/docker-compose
 
 COPY --chown=1000 ./devenv.sh ./compose.yml /app
 COPY --chown=1000 ./compose /app/compose