diff --git a/Dockerfile b/Dockerfile index a7c274b9a59..f0704a3c01b 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-20251208-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