Skip to content

Commit a2ef375

Browse files
committed
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>
1 parent bf664a0 commit a2ef375

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

dockerfiles/Dockerfile.e2e

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ RUN apt-get update && apt-get install -y \
1010
openssh-client \
1111
&& rm -rf /var/lib/apt/lists/*
1212

13-
ARG COMPOSE_VERSION=1.25.1
13+
ARG COMPOSE_VERSION=1.29.2
1414
RUN curl -fsSL https://github.com/docker/compose/releases/download/${COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose \
1515
&& chmod +x /usr/local/bin/docker-compose
1616

@@ -39,7 +39,6 @@ ARG GITCOMMIT
3939
ENV VERSION=${VERSION}
4040
ENV GITCOMMIT=${GITCOMMIT}
4141
ENV DOCKER_BUILDKIT=1
42-
ENV COMPOSE_DOCKER_CLI_BUILD=1
4342
RUN ./scripts/build/binary
4443
RUN ./scripts/build/plugins e2e/cli-plugins/plugins/*
4544

0 commit comments

Comments
 (0)