Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

e2e: update docker-compose to 1.29.2 

Newer versions have COMPOSE_DOCKER_CLI_BUILD enabled by default,
so removing that env-var.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 524e3b215d)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2021-06-09 14:07:58 +02:00
parent 81d965569d
commit 1f9a0df05a
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dockerfiles/Dockerfile.e2e
View File

@ -10,7 +10,7 @@ RUN apt-get update && apt-get install -y \
openssh-client \ openssh-client \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
ARG COMPOSE_VERSION=1.25.1 ARG COMPOSE_VERSION=1.29.2
RUN curl -fsSL https://github.com/docker/compose/releases/download/${COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose \ RUN curl -fsSL https://github.com/docker/compose/releases/download/${COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose \
&& chmod +x /usr/local/bin/docker-compose && chmod +x /usr/local/bin/docker-compose
@ -39,7 +39,6 @@ ARG GITCOMMIT
ENV VERSION=${VERSION} ENV VERSION=${VERSION}
ENV GITCOMMIT=${GITCOMMIT} ENV GITCOMMIT=${GITCOMMIT}
ENV DOCKER_BUILDKIT=1 ENV DOCKER_BUILDKIT=1
ENV COMPOSE_DOCKER_CLI_BUILD=1
RUN ./scripts/build/binary RUN ./scripts/build/binary
RUN ./scripts/build/plugins e2e/cli-plugins/plugins/* RUN ./scripts/build/plugins e2e/cli-plugins/plugins/*