Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use the correct version of glide 

In `man/Dockerfile` we are specifying a tagged version of glide to
checkout, but never actually checking it out.
This checks out the requested version before building.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
This commit is contained in:
Brian Goff 2016-08-18 20:03:08 -04:00 committed by Tibor Vass
parent 280a6f9663
commit 3ef90ec019
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
man/Dockerfile
View File

@ -9,6 +9,7 @@ RUN export GLIDE=v0.11.1; \
mkdir -p ${TARGET} && \ mkdir -p ${TARGET} && \
git clone https://github.com/Masterminds/glide.git ${TARGET}/glide && \ git clone https://github.com/Masterminds/glide.git ${TARGET}/glide && \
cd ${TARGET}/glide && \ cd ${TARGET}/glide && \
git checkout $GLIDE && \
make build && \ make build && \
cp ./glide /usr/bin/glide && \ cp ./glide /usr/bin/glide && \
cd / && rm -rf /go/src/* /go/bin/* /go/pkg/* cd / && rm -rf /go/src/* /go/bin/* /go/pkg/*

1
man/Dockerfile.armhf
View File

@ -9,6 +9,7 @@ RUN export GLIDE=v0.11.1; \
mkdir -p ${TARGET} && \ mkdir -p ${TARGET} && \
git clone https://github.com/Masterminds/glide.git ${TARGET}/glide && \ git clone https://github.com/Masterminds/glide.git ${TARGET}/glide && \
cd ${TARGET}/glide && \ cd ${TARGET}/glide && \
git checkout $GLIDE && \
make build && \ make build && \
cp ./glide /usr/bin/glide && \ cp ./glide /usr/bin/glide && \
cd / && rm -rf /go/src/* /go/bin/* /go/pkg/* cd / && rm -rf /go/src/* /go/bin/* /go/pkg/*