Revert "Migrate build to use go modules"

This reverts commit 3439a34989b082ebc3d711853fdc2372798ff121.

For the moment with bad wifi this is just taking too, too long. We may
be able to figure out an approach that bind mounts the cache in which
should help drastically.
This commit is contained in:
Jeff Mitchell 2019-07-09 04:15:03 -04:00
parent 71ea55751b
commit ec12124c6b
2 changed files with 3 additions and 3 deletions

View File

@ -36,6 +36,6 @@ RUN go get github.com/hashicorp/go-bindata/go-bindata
RUN go get github.com/elazarl/go-bindata-assetfs
RUN go get github.com/elazarl/go-bindata-assetfs/go-bindata-assetfs
RUN mkdir /vault
WORKDIR /vault
RUN mkdir -p /gopath/src/github.com/hashicorp/vault
WORKDIR /gopath/src/github.com/hashicorp/vault
CMD make static-dist bin

View File

@ -41,7 +41,7 @@ fi
# Build the packages
if [ -z $NOBUILD ]; then
# This should be a local build of the Dockerfile in the cross dir
docker run --rm -v "$(pwd)":/vault -w /vault ${DOCKER_CROSS_IMAGE}
docker run --rm -v "$(pwd)":/gopath/src/github.com/hashicorp/vault -w /gopath/src/github.com/hashicorp/vault ${DOCKER_CROSS_IMAGE}
fi
# Zip all the files