Skip to content
This repository has been archived by the owner on Sep 26, 2021. It is now read-only.

Commit

Permalink
Bump versions -> 18.01.0-ce
Browse files Browse the repository at this point in the history
Signed-off-by: Joffrey F <[email protected]>
  • Loading branch information
shin- committed Jan 11, 2018
1 parent 32443a9 commit 4c43383
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 8 deletions.
5 changes: 2 additions & 3 deletions Dockerfile.windows
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ ENV DEBIAN_FRONTEND noninteractive
ARG DOCKER_RELEASE_STAGE
ARG INSTALLER_VERSION
ARG DOCKER_VERSION
ARG DOCKER_CLI_COMMIT
ARG DOCKER_COMPOSE_VERSION
ARG DOCKER_MACHINE_VERSION
ARG KITEMATIC_VERSION
Expand Down Expand Up @@ -34,11 +33,11 @@ RUN mkdir -p /go/src/github.com/docker/

RUN git clone https://github.com/docker/docker-ce.git /docker-ce && \
cd /docker-ce && \
git checkout $DOCKER_CLI_COMMIT && \
git checkout "v${DOCKER_VERSION}" && \
cp -R components/cli /go/src/github.com/docker/

WORKDIR /go/src/github.com/docker/cli
RUN VERSION=$DOCKER_VERSION GITCOMMIT=$(echo $DOCKER_CLI_COMMIT | cut -c 1-7) ./scripts/build/windows
RUN VERSION=$DOCKER_VERSION GITCOMMIT=$(cd /docker-ce && git rev-parse --short HEAD) ./scripts/build/windows

# Assemble bundle
RUN mkdir /bundle
Expand Down
1 change: 0 additions & 1 deletion script/build-windows
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ docker build \
--build-arg DOCKER_RELEASE_STAGE="${DOCKER_RELEASE_STAGE}" \
--build-arg INSTALLER_VERSION="${INSTALLER_VERSION}" \
--build-arg DOCKER_VERSION="${DOCKER_VERSION}" \
--build-arg DOCKER_CLI_COMMIT="${DOCKER_CLI_COMMIT}" \
--build-arg DOCKER_COMPOSE_VERSION="${DOCKER_COMPOSE_VERSION}" \
--build-arg DOCKER_MACHINE_VERSION="${DOCKER_MACHINE_VERSION}" \
--build-arg KITEMATIC_VERSION="${KITEMATIC_VERSION}" \
Expand Down
7 changes: 3 additions & 4 deletions versions
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
DOCKER_RELEASE_STAGE=stable
INSTALLER_VERSION=17.12.0-ce
DOCKER_VERSION=17.12.0-ce
DOCKER_CLI_COMMIT=c97c6d62c26c1da407e3086f0b5d3d866ed308bc
DOCKER_RELEASE_STAGE=edge
INSTALLER_VERSION=18.01.0-ce
DOCKER_VERSION=18.01.0-ce
DOCKER_COMPOSE_VERSION=1.18.0
DOCKER_MACHINE_VERSION=0.13.0
KITEMATIC_VERSION=0.17.2
Expand Down

0 comments on commit 4c43383

Please sign in to comment.