From 5e4878ed2b441359c4b1a216c1b3fe195cbc6975 Mon Sep 17 00:00:00 2001 From: Cory Snider Date: Tue, 11 Jul 2023 16:40:08 -0400 Subject: [PATCH] Dockerfile/shell: install compose cli plugin It's convenient to have in the dev container when debugging issues which reproduce consistently when deploying containers through compose. Signed-off-by: Cory Snider --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 1be7b5167d..830668eeee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,6 +13,7 @@ ARG DOCKERCLI_VERSION=v24.0.2 ARG DOCKERCLI_INTEGRATION_REPOSITORY="https://github.com/docker/cli.git" ARG DOCKERCLI_INTEGRATION_VERSION=v17.06.2-ce ARG BUILDX_VERSION=0.11.0 +ARG COMPOSE_VERSION=v2.20.0 ARG SYSTEMD="false" ARG DEBIAN_FRONTEND=noninteractive @@ -438,6 +439,7 @@ FROM containerutil-build AS containerutil-windows-amd64 FROM containerutil-windows-${TARGETARCH} AS containerutil-windows FROM containerutil-${TARGETOS} AS containerutil FROM docker/buildx-bin:${BUILDX_VERSION} as buildx +FROM docker/compose-bin:${COMPOSE_VERSION} as compose FROM base AS dev-systemd-false COPY --link --from=frozen-images /build/ /docker-frozen-images @@ -464,6 +466,7 @@ COPY --link --from=containerutil /build/ /usr/local/bin/ COPY --link --from=crun /build/ /usr/local/bin/ COPY --link hack/dockerfile/etc/docker/ /etc/docker/ COPY --link --from=buildx /buildx /usr/local/libexec/docker/cli-plugins/docker-buildx +COPY --link --from=compose /docker-compose /usr/libexec/docker/cli-plugins/docker-compose ENV PATH=/usr/local/cli:$PATH ENV TEST_CLIENT_BINARY=/usr/local/cli-integration/docker