From c804b1083ea7e5252ef5e53364f2d8e17af00f95 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 15 Jan 2020 18:41:44 +0100 Subject: [PATCH] Dockerfile.e2e: update compose v1.25.1, enable buildkit Signed-off-by: Sebastiaan van Stijn --- dockerfiles/Dockerfile.e2e | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dockerfiles/Dockerfile.e2e b/dockerfiles/Dockerfile.e2e index 7f2f423896..456158fd4e 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.21.2 +ARG COMPOSE_VERSION=1.25.1 RUN curl -L 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 @@ -36,7 +36,10 @@ RUN echo 'notary.cert' >> /etc/ca-certificates.conf && update-ca-certificates COPY . . ARG VERSION ARG GITCOMMIT -ENV VERSION=${VERSION} GITCOMMIT=${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/*