This repository was archived by the owner on Sep 26, 2021. It is now read-only.
File tree Expand file tree Collapse file tree 3 files changed +5
-8
lines changed Expand file tree Collapse file tree 3 files changed +5
-8
lines changed Original file line number Diff line number Diff line change @@ -5,7 +5,6 @@ ENV DEBIAN_FRONTEND noninteractive
55ARG DOCKER_RELEASE_STAGE
66ARG INSTALLER_VERSION
77ARG DOCKER_VERSION
8- ARG DOCKER_CLI_COMMIT
98ARG DOCKER_COMPOSE_VERSION
109ARG DOCKER_MACHINE_VERSION
1110ARG KITEMATIC_VERSION
@@ -34,11 +33,11 @@ RUN mkdir -p /go/src/github.com/docker/
3433
3534RUN git clone https://github.com/docker/docker-ce.git /docker-ce && \
3635 cd /docker-ce && \
37- git checkout $DOCKER_CLI_COMMIT && \
36+ git checkout "v${DOCKER_VERSION}" && \
3837 cp -R components/cli /go/src/github.com/docker/
3938
4039WORKDIR /go/src/github.com/docker/cli
41- RUN VERSION=$DOCKER_VERSION GITCOMMIT=$(echo $DOCKER_CLI_COMMIT | cut -c 1-7 ) ./scripts/build/windows
40+ RUN VERSION=$DOCKER_VERSION GITCOMMIT=$(cd /docker-ce && git rev-parse --short HEAD ) ./scripts/build/windows
4241
4342# Assemble bundle
4443RUN mkdir /bundle
Original file line number Diff line number Diff line change @@ -9,7 +9,6 @@ docker build \
99 --build-arg DOCKER_RELEASE_STAGE=" ${DOCKER_RELEASE_STAGE} " \
1010 --build-arg INSTALLER_VERSION=" ${INSTALLER_VERSION} " \
1111 --build-arg DOCKER_VERSION=" ${DOCKER_VERSION} " \
12- --build-arg DOCKER_CLI_COMMIT=" ${DOCKER_CLI_COMMIT} " \
1312 --build-arg DOCKER_COMPOSE_VERSION=" ${DOCKER_COMPOSE_VERSION} " \
1413 --build-arg DOCKER_MACHINE_VERSION=" ${DOCKER_MACHINE_VERSION} " \
1514 --build-arg KITEMATIC_VERSION=" ${KITEMATIC_VERSION} " \
Original file line number Diff line number Diff line change 1- DOCKER_RELEASE_STAGE=stable
2- INSTALLER_VERSION=17.12.0-ce
3- DOCKER_VERSION=17.12.0-ce
4- DOCKER_CLI_COMMIT=c97c6d62c26c1da407e3086f0b5d3d866ed308bc
1+ DOCKER_RELEASE_STAGE=edge
2+ INSTALLER_VERSION=18.01.0-ce
3+ DOCKER_VERSION=18.01.0-ce
54DOCKER_COMPOSE_VERSION=1.18.0
65DOCKER_MACHINE_VERSION=0.13.0
76KITEMATIC_VERSION=0.17.2
You can’t perform that action at this time.
0 commit comments