Merge pull request #606 from ndeloof/goproxy

Configure GOPROXY

Author: chris-crone

Dockerfile

@@ -10,6 +10,7 @@ WORKDIR /go/src/github.com/docker/cli
 
 RUN git clone https://github.com/docker/cli . && git checkout a1b83ffd2cbeefc0752e5aa7a543d49c1ddfd2cb
 
+ARG GOPROXY
 RUN make binary-osx binary-windows binary && \
  cp build/docker-linux-amd64 /usr/bin/docker
 
@@ -22,6 +23,7 @@ ARG DEP_VERSION=v0.5.1
 RUN curl -o /usr/bin/dep -L https://github.com/golang/dep/releases/download/${DEP_VERSION}/dep-linux-amd64 && \
     chmod +x /usr/bin/dep
 ARG GOTESTSUM_VERSION=v0.3.4
+ARG GOPROXY
 RUN mkdir $GOPATH/src/gotest.tools && \
     git clone -q https://github.com/gotestyourself/gotestsum $GOPATH/src/gotest.tools/gotestsum && \
     cd $GOPATH/src/gotest.tools/gotestsum && \

Jenkinsfile

@@ -9,6 +9,7 @@ pipeline {
 
     environment {
         TAG = "${env.BUILD_TAG}"
+        GOPROXY="direct"
     }
 
     stages {

docker.Makefile

@@ -15,7 +15,7 @@ E2E_CROSS_CTNR_NAME := $(BIN_NAME)-e2e-cross-$(TAG)
 COV_CTNR_NAME := $(BIN_NAME)-cov-$(TAG)
 SCHEMAS_CTNR_NAME := $(BIN_NAME)-schemas-$(TAG)
 
-BUILD_ARGS=--build-arg=EXPERIMENTAL=$(EXPERIMENTAL) --build-arg=TAG=$(TAG) --build-arg=COMMIT=$(COMMIT) --build-arg=ALPINE_VERSION=$(ALPINE_VERSION)
+BUILD_ARGS=--build-arg=EXPERIMENTAL --build-arg=TAG --build-arg=COMMIT --build-arg=ALPINE_VERSION --build-arg=GOPROXY
 
 PKG_PATH := /go/src/$(PKG_NAME)
 
@@ -128,7 +128,7 @@ vendor: build_dev_image
 	# git bash, mingw and msys by default rewrite args that seems to be linux paths and try to expand that to a meaningful windows path
 	# we don't want that to happen when mounting paths referring to files located in the container. Thus we use the double "//" prefix that works
 	# both on windows, linux and macos
-	docker run -it --name docker-app-vendoring -v docker-app-vendor-cache://dep-cache -e DEPCACHEDIR=//dep-cache $(DEV_IMAGE_NAME) sh -c "rm -rf ./vendor && make vendor DEP_ARGS=\"$(DEP_ARGS)\""	
+	docker run -it --name docker-app-vendoring -v docker-app-vendor-cache://dep-cache -e DEPCACHEDIR=//dep-cache $(DEV_IMAGE_NAME) sh -c "rm -rf ./vendor && make vendor DEP_ARGS=\"$(DEP_ARGS)\""
 	rm -rf ./vendor
 	docker cp docker-app-vendoring:/go/src/github.com/docker/app/vendor .
 	docker cp docker-app-vendoring:/go/src/github.com/docker/app/Gopkg.lock .