diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 0e60101c989..7b8b71c5c4f 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -32,6 +32,6 @@ updates: - dependency-name: "octopusdeploy/dhi-debian-base" update-types: - version-update:semver-major - - dependency-name: "docker/compose-bin" + - dependency-name: "octopusdeploy/dhi-docker" update-types: - version-update:semver-major diff --git a/Dockerfile b/Dockerfile index 7d2fcd6cd03..a2a62ba6487 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,12 @@ -FROM docker/compose-bin:v5.7.1@sha256:6a6704a7ccbc45eb4cc7e5b71dba685e9bc23705c580430f15034b2b5e46ec2b AS compose-bin +# DHI source: https://hub.docker.com/repository/docker/octopusdeploy/dhi-docker +FROM octopusdeploy/dhi-docker:29.10.0-cli@sha256:2a19c4cb31621c029f0be3b33a9cebabdfe6d5605f80f52bac727a496a88afea AS docker # DHI source: https://hub.docker.com/repository/docker/octopusdeploy/dhi-debian-base FROM octopusdeploy/dhi-debian-base:trixie-debian13@sha256:e3e8512202bb7d8a7093905a3615408784beba909b3cd61d3bb49367f5cfa448 AS compose-plugin WORKDIR /home/compose -COPY --chown=nonroot:nonroot --chmod=755 --from=compose-bin /docker-compose /usr/local/bin/docker-compose - +COPY --chown=nonroot:nonroot --chmod=755 --from=docker /usr/libexec/docker/cli-plugins/docker-compose /usr/local/bin/docker-compose ENV COMPOSE_COMPATIBILITY=true USER nonroot:nonroot +RUN docker-compose --version ENTRYPOINT [ "docker-compose" ] diff --git a/service.yaml b/service.yaml index b2237dea66a..34af3503d3c 100644 --- a/service.yaml +++ b/service.yaml @@ -1 +1 @@ -version: 1.7.1 +version: 1.8.0