From 57612184adce6db47bdd7993bcced3a39dd91fb4 Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Tue, 9 Jul 2019 04:15:03 -0400 Subject: [PATCH] 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. --- scripts/cross/Dockerfile | 4 ++-- scripts/dist.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/cross/Dockerfile b/scripts/cross/Dockerfile index 8056ec8703..4e046befe0 100644 --- a/scripts/cross/Dockerfile +++ b/scripts/cross/Dockerfile @@ -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 diff --git a/scripts/dist.sh b/scripts/dist.sh index 1b8fb35bff..1e1b2f7b70 100755 --- a/scripts/dist.sh +++ b/scripts/dist.sh @@ -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