Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
# 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
ARG COMPOSE_VERSION=v5.0.1
FROM docker/compose-bin:${COMPOSE_VERSION} AS compose-bin

FROM debian:trixie-20251208-slim AS compose-plugin

# DHI source: https://hub.docker.com/repository/docker/octopusdeploy/dhi-debian-base
FROM octopusdeploy/dhi-debian-base:trixie-debian13 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=compose --chown=compose:compose /docker-compose /usr/local/bin/docker-compose
COPY --chown=nonroot:nonroot --chmod=755 --from=compose-bin /docker-compose /usr/local/bin/docker-compose

ENV COMPOSE_COMPATIBILITY=true
USER compose:compose
USER nonroot:nonroot
ENTRYPOINT [ "docker-compose" ]
2 changes: 1 addition & 1 deletion service.yaml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version: 1.5.8
version: 1.6.0