Skip to content

Commit 4616aae

Browse files
chore: CR-32904 - update docker compose to v5.0.1 (#22)
* chore: CR-32904 - update docker compose to v5.0.1 * bump version * build: use DHI base --------- Co-authored-by: Zhenya Tikhonov <masontikhonov@gmail.com>
1 parent 64b1419 commit 4616aae

2 files changed

Lines changed: 8 additions & 12 deletions

File tree

Dockerfile

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
11
# CI relies on this ARG. Don't remove or rename it
2-
ARG COMPOSE_VERSION=v2.40.3
3-
FROM docker/compose-bin:${COMPOSE_VERSION} AS compose
2+
ARG COMPOSE_VERSION=v5.0.1
3+
FROM docker/compose-bin:${COMPOSE_VERSION} AS compose-bin
44

5-
FROM debian:trixie-20251208-slim AS compose-plugin
5+
6+
# DHI source: https://hub.docker.com/repository/docker/octopusdeploy/dhi-debian-base
7+
FROM octopusdeploy/dhi-debian-base:trixie-debian13 AS compose-plugin
68
WORKDIR /home/compose
7-
RUN groupadd --gid 3000 compose \
8-
&& useradd --uid 3000 \
9-
--gid 3000 \
10-
--home /home/compose \
11-
--shell /bin/bash \
12-
compose
13-
COPY --from=compose --chown=compose:compose /docker-compose /usr/local/bin/docker-compose
9+
COPY --chown=nonroot:nonroot --chmod=755 --from=compose-bin /docker-compose /usr/local/bin/docker-compose
1410

1511
ENV COMPOSE_COMPATIBILITY=true
16-
USER compose:compose
12+
USER nonroot:nonroot
1713
ENTRYPOINT [ "docker-compose" ]

service.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version: 1.5.8
1+
version: 1.6.0

0 commit comments

Comments
 (0)