Skip to content

Commit

Permalink
Up the version of the docker CLI to 18.06 (#282)
Browse files Browse the repository at this point in the history
  • Loading branch information
ehotinger authored Sep 10, 2018
1 parent f7035b5 commit 5b5f997
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions baseimages/docker-cli/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Required.
# docker build -f baseimages/docker/Dockerfile -t docker .
FROM docker:18.03.0-ce-git
# docker build -f baseimages/docker-cli/Dockerfile -t docker .
FROM docker:18.06.0-ce-git
6 changes: 3 additions & 3 deletions baseimages/docker-cli/Windows.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Required.
# docker build -f baseimages/docker/Windows.Dockerfile -t docker .
# docker build -f baseimages/docker-cli/Windows.Dockerfile -t docker .

ARG WINDOWS_IMAGE=microsoft/windowsservercore:1803
FROM $WINDOWS_IMAGE as environment
Expand Down Expand Up @@ -71,8 +71,8 @@ RUN $url = ('https://golang.org/dl/go{0}.windows-amd64.zip' -f $env:GOLANG_VERSI

# Build the docker executable
FROM environment as dockercli
# v18.03
ARG DOCKER_CLI_LKG_COMMIT=c98c4080a323fb0e4fdf7429d8af4e2e946d09b5
# v18.06
ARG DOCKER_CLI_LKG_COMMIT=2cb2e84287c916d484cf5d6fc93987ba537f3aab
WORKDIR \\gopath\\src\\github.com\\docker\\cli
RUN git clone https://github.com/docker/cli.git \gopath\src\github.com\docker\cli; \
git checkout $DOCKER_CLI_LKG_COMMIT; \
Expand Down

0 comments on commit 5b5f997

Please sign in to comment.