Skip to content

Commit 5e71557

Browse files
committed
Update CLI build
Account for changes in docker/cli#2993
1 parent 1f6049a commit 5e71557

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

docker-master/Dockerfile.build

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ENV DOCKER_BUILDTAGS \
2323
# we cannot support devicemapper properly in a fully-static binary
2424
exclude_graphdriver_devicemapper
2525

26-
ENV DOCKER_GITCOMMIT af79e6a074e124c160fa87911fd432fd12b11668
26+
ENV DOCKER_GITCOMMIT 06ad89b957c2102620e95081f92c31f55c809fab
2727

2828
WORKDIR /docker-ce
2929
RUN set -ex; \
@@ -40,8 +40,10 @@ RUN set -eux; \
4040

4141
RUN set -eux; \
4242
echo 'module github.com/docker/cli' > components/cli/go.mod; \
43-
GOFLAGS='-mod=vendor' make -C components/cli binary; \
44-
cp -avlL components/cli/build/docker /usr/local/bin/; \
43+
cd components/cli; \
44+
# can't use the Makefile anymore thanks to https://github.com/docker/cli/pull/2993 ...
45+
GOFLAGS='-mod=vendor' CGO_ENABLED=0 GITCOMMIT="$DOCKER_GITCOMMIT" ./scripts/build/binary; \
46+
cp -avlL build/docker /usr/local/bin/; \
4547
docker --version; \
4648
ldd /usr/local/bin/docker || :
4749

0 commit comments

Comments
 (0)