From 2bc8ff039dd86995bfa72c5e13579b92578fc943 Mon Sep 17 00:00:00 2001 From: Zhenya Tikhonov Date: Fri, 12 Dec 2025 15:51:54 +0400 Subject: [PATCH 1/4] ci: revert `ARG COMPOSE_VERSION` --- Dockerfile | 5 ++++- service.yaml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f0704a3c01..7aa06d9ea1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,6 @@ +ARG COMPOSE_VERSION=v2.40.3 +# ↑ CI relies on this ARG. Don't remove or rename it ↑ + FROM debian:trixie-20251208-slim AS compose-plugin WORKDIR /home/compose RUN groupadd --gid 3000 compose \ @@ -6,7 +9,7 @@ RUN groupadd --gid 3000 compose \ --home /home/compose \ --shell /bin/bash \ compose -COPY --from=docker/compose-bin:v2.40.3 --chown=compose:compose /docker-compose /usr/local/bin/docker-compose +COPY --from=docker/compose-bin:${COMPOSE_VERSION} --chown=compose:compose /docker-compose /usr/local/bin/docker-compose ENV COMPOSE_COMPATIBILITY=true USER compose:compose diff --git a/service.yaml b/service.yaml index d63350cf71..3edec6d35f 100644 --- a/service.yaml +++ b/service.yaml @@ -1 +1 @@ -version: 1.5.7 +version: 1.5.8 From 226b5bbfd69091c78a5bde77e1020c6b51a30a4f Mon Sep 17 00:00:00 2001 From: Zhenya Tikhonov Date: Fri, 12 Dec 2025 20:00:54 +0400 Subject: [PATCH 2/4] ci: delete comment --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7aa06d9ea1..95aafdc0db 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,4 @@ ARG COMPOSE_VERSION=v2.40.3 -# ↑ CI relies on this ARG. Don't remove or rename it ↑ FROM debian:trixie-20251208-slim AS compose-plugin WORKDIR /home/compose From 86c4566dea465f3efefb193123d62c482a7c609b Mon Sep 17 00:00:00 2001 From: Zhenya Tikhonov Date: Fri, 12 Dec 2025 20:08:37 +0400 Subject: [PATCH 3/4] ci: return comment --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 95aafdc0db..5b184cbbb5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,4 @@ +# CI relies on this ARG. Don't remove or rename it ARG COMPOSE_VERSION=v2.40.3 FROM debian:trixie-20251208-slim AS compose-plugin From 9f7608a9b7f3f960b77627ce668a3bd225dc2ef2 Mon Sep 17 00:00:00 2001 From: Zhenya Tikhonov Date: Fri, 12 Dec 2025 20:14:00 +0400 Subject: [PATCH 4/4] ci: fix variable expansion --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5b184cbbb5..cac8c009d9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,6 @@ # CI relies on this ARG. Don't remove or rename it ARG COMPOSE_VERSION=v2.40.3 +FROM docker/compose-bin:${COMPOSE_VERSION} AS compose FROM debian:trixie-20251208-slim AS compose-plugin WORKDIR /home/compose @@ -9,7 +10,7 @@ RUN groupadd --gid 3000 compose \ --home /home/compose \ --shell /bin/bash \ compose -COPY --from=docker/compose-bin:${COMPOSE_VERSION} --chown=compose:compose /docker-compose /usr/local/bin/docker-compose +COPY --from=compose --chown=compose:compose /docker-compose /usr/local/bin/docker-compose ENV COMPOSE_COMPATIBILITY=true USER compose:compose