From ea29f2f1fa0e2a3d913005ab7b1360f90ae2a716 Mon Sep 17 00:00:00 2001 From: Zhenya Tikhonov Date: Tue, 2 Dec 2025 00:29:00 +0400 Subject: [PATCH 01/10] build: upgrade dependencies --- Dockerfile | 22 +++++++++------------- service.yaml | 2 +- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index a7c274b9a59..488685f525d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,13 @@ -ARG COMPOSE_VERSION=v2.37.0 -FROM docker/compose-bin:${COMPOSE_VERSION} AS compose - -FROM debian:bookworm-20250908-slim AS compose-plugin +FROM debian:trixie-20251117-slim AS compose-plugin WORKDIR /home/compose +RUN groupadd --gid 3000 compose \ + && useradd --uid 3000 \ + --gid 3000 \ + --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 + ENV COMPOSE_COMPATIBILITY=true -# add user -RUN addgroup --gid 3000 compose && \ - adduser --uid 3000 --gecos "" --disabled-password \ - --ingroup compose \ - --home /home/compose \ - --shell /bin/bash compose USER compose:compose - -COPY --from=compose --chown=compose:compose /docker-compose /usr/local/bin/docker-compose - ENTRYPOINT [ "docker-compose" ] diff --git a/service.yaml b/service.yaml index b0f3f4cd069..d63350cf71a 100644 --- a/service.yaml +++ b/service.yaml @@ -1 +1 @@ -version: 1.5.6 +version: 1.5.7 From ed59e24d14617a3aeea98f8051ecb2e40ffaa62d Mon Sep 17 00:00:00 2001 From: Zhenya Tikhonov Date: Tue, 9 Dec 2025 02:31:22 +0400 Subject: [PATCH 02/10] ci: trigger ci From 1417bff593a3613c362bc199bb3a3d279014f10c Mon Sep 17 00:00:00 2001 From: Zhenya Tikhonov Date: Tue, 9 Dec 2025 02:37:34 +0400 Subject: [PATCH 03/10] ci: trigger ci From ef1ec99a5dd8d1b8365dac191d3f2a1a51956a9c Mon Sep 17 00:00:00 2001 From: Zhenya Tikhonov Date: Tue, 9 Dec 2025 02:45:05 +0400 Subject: [PATCH 04/10] ci: trigger ci From 944167a2aa753e702ae6dcf09e1470fe3b347010 Mon Sep 17 00:00:00 2001 From: Zhenya Tikhonov Date: Tue, 9 Dec 2025 02:53:48 +0400 Subject: [PATCH 05/10] ci: trigger ci From c09520b78d5787065e8010c66ec40ab29a673a3a Mon Sep 17 00:00:00 2001 From: Zhenya Tikhonov Date: Tue, 9 Dec 2025 03:13:31 +0400 Subject: [PATCH 06/10] ci: trigger ci From 3d60ac9de8253f7ebbf080fa5e486314a789e986 Mon Sep 17 00:00:00 2001 From: Zhenya Tikhonov Date: Tue, 9 Dec 2025 16:56:25 +0400 Subject: [PATCH 07/10] build: upgrade compose --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 488685f525d..70e728cace8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,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:v5.0.0 --chown=compose:compose /docker-compose /usr/local/bin/docker-compose ENV COMPOSE_COMPATIBILITY=true USER compose:compose From e1e0d7534b6bcc38c5269e31df5e3a4e2215f49a Mon Sep 17 00:00:00 2001 From: Zhenya Tikhonov Date: Tue, 9 Dec 2025 17:16:56 +0400 Subject: [PATCH 08/10] build: upgrade base image --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 70e728cace8..8978529995c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:trixie-20251117-slim AS compose-plugin +FROM debian:trixie-20251208-slim AS compose-plugin WORKDIR /home/compose RUN groupadd --gid 3000 compose \ && useradd --uid 3000 \ From e84c0a9a057c0943897c12004e4760e3f02a5007 Mon Sep 17 00:00:00 2001 From: Zhenya Tikhonov Date: Tue, 9 Dec 2025 18:27:59 +0400 Subject: [PATCH 09/10] build: downgrade Docker compose --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8978529995c..f0704a3c01b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ RUN groupadd --gid 3000 compose \ --home /home/compose \ --shell /bin/bash \ compose -COPY --from=docker/compose-bin:v5.0.0 --chown=compose:compose /docker-compose /usr/local/bin/docker-compose +COPY --from=docker/compose-bin:v2.40.3 --chown=compose:compose /docker-compose /usr/local/bin/docker-compose ENV COMPOSE_COMPATIBILITY=true USER compose:compose From c9756a6ca4a709764f437af891ed20e9d4e23fdf Mon Sep 17 00:00:00 2001 From: Zhenya Tikhonov Date: Tue, 9 Dec 2025 18:50:59 +0400 Subject: [PATCH 10/10] ci: trigger ci