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

Merge pull request #2258 from thaJeztah/e2e_update_compose 

Dockerfile.e2e: update compose v1.25.1, enable buildkit
This commit is contained in:
Silvin Lubecki 2020-01-16 11:27:49 +01:00 committed by GitHub
parent 0ab564b1c8 c804b1083e
commit ddde460613
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
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.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 \ 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 && chmod +x /usr/local/bin/docker-compose
@ -36,7 +36,10 @@ RUN echo 'notary.cert' >> /etc/ca-certificates.conf && update-ca-certificates
COPY . . COPY . .
ARG VERSION ARG VERSION
ARG GITCOMMIT 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/binary
RUN ./scripts/build/plugins e2e/cli-plugins/plugins/* RUN ./scripts/build/plugins e2e/cli-plugins/plugins/*