From 1f9a0df05a93fbe41cee0b884e6d1cb469ec97a8 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 9 Jun 2021 14:07:58 +0200 Subject: [PATCH] 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 (cherry picked from commit 524e3b215dc92119194b5ebe47a95720ca8f78c7) Signed-off-by: Sebastiaan van Stijn --- dockerfiles/Dockerfile.e2e | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dockerfiles/Dockerfile.e2e b/dockerfiles/Dockerfile.e2e index b9a7b3624b..eb1714b779 100644 --- a/dockerfiles/Dockerfile.e2e +++ b/dockerfiles/Dockerfile.e2e @@ -10,7 +10,7 @@ RUN apt-get update && apt-get install -y \ openssh-client \ && 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 \ && chmod +x /usr/local/bin/docker-compose @@ -39,7 +39,6 @@ ARG GITCOMMIT ENV VERSION=${VERSION} ENV GITCOMMIT=${GITCOMMIT} ENV DOCKER_BUILDKIT=1 -ENV COMPOSE_DOCKER_CLI_BUILD=1 RUN ./scripts/build/binary RUN ./scripts/build/plugins e2e/cli-plugins/plugins/*