From 3be03b1b85d8849c030e1e2b951d8d96846d67aa Mon Sep 17 00:00:00 2001 From: Marcos Lilljedahl Date: Wed, 12 Jul 2017 19:15:09 -0300 Subject: [PATCH] Add MOBY_COMMIT to dockerfile --- Dockerfile.dind | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile.dind b/Dockerfile.dind index 2251d9e..378fdfd 100644 --- a/Dockerfile.dind +++ b/Dockerfile.dind @@ -6,10 +6,12 @@ RUN apk add --no-cache git tmux py2-pip apache2-utils vim build-base gettext-dev ENV GOPATH /root/go ENV PATH $PATH:$GOPATH -# Download moby and linuxkit +# Use specific moby commit due to vendoring mismatch +ENV MOBY_COMMIT="a73c3d3667f32fd61febcd2e824aa0341a57bafd" RUN mkdir /root/go && apk add --no-cache go \ - && go get -u github.com/moby/tool/cmd/moby github.com/linuxkit/linuxkit/src/cmd/linuxkit \ + && go get -u -d github.com/moby/tool/cmd/moby && (cd $GOPATH/src/github.com/moby/tool/cmd/moby && git checkout $MOBY_COMMIT && go install) \ + && go get -u github.com/linuxkit/linuxkit/src/cmd/linuxkit \ && rm -rf /root/go/pkg && rm -rf /root/go/src && rm -rf /usr/lib/go # Compile and install httping