Merge pull request #108 from IBM/akash

Changing image building

Author: akgunjal

block-storage-attacher/Dockerfile.builder

@@ -1,5 +1,7 @@
 FROM golang:1.15.2
 
+ARG GOPROXY=off
+
 WORKDIR /go/src/github.com/IBM/ibmcloud-storage-utilities/block-storage-attacher
 ADD . /go/src/github.com/IBM/ibmcloud-storage-utilities/block-storage-attacher
 RUN set -ex; cd /go/src/github.com/IBM/ibmcloud-storage-utilities/block-storage-attacher/ && \

block-storage-attacher/Makefile

@@ -26,6 +26,7 @@ deps:
 #	glide install --strip-vendor
 	go get github.com/pierrre/gotestcover
 	go get -v github.com/securego/gosec/cmd/gosec
+	go get github.ibm.com/alchemy-containers/[email protected]
 
 .PHONY: fmt
 fmt:
@@ -54,20 +55,23 @@ coverage:
 
 .PHONY: buildimage
 buildimage: build-systemutil
-	docker build	\
-        --build-arg git_commit_id=${GIT_COMMIT_SHA} \
-        --build-arg git_remote_url=${GIT_REMOTE_URL} \
-        --build-arg build_date=${BUILD_DATE} \
-				--build-arg travis_build_number=${TRAVIS_BUILD_NUMBER} \
-				--build-arg REPO_SOURCE_URL=${REPO_SOURCE_URL} \
-				--build-arg BUILD_URL=${BUILD_URL} \
-	-t $(IMAGE):$(VERSION) -f Dockerfile .
+	go run github.ibm.com/alchemy-containers/go-build-tools/cmd/goproxy -docker-build -- \
+		docker build \
+			--build-arg git_commit_id=${GIT_COMMIT_SHA} \
+			--build-arg git_remote_url=${GIT_REMOTE_URL} \
+			--build-arg build_date=${BUILD_DATE} \
+			--build-arg travis_build_number=${TRAVIS_BUILD_NUMBER} \
+			--build-arg REPO_SOURCE_URL=${REPO_SOURCE_URL} \
+			--build-arg BUILD_URL=${BUILD_URL} \
+			-t $(IMAGE):$(VERSION) -f Dockerfile .
 
 
 .PHONY: build-systemutil
 build-systemutil:
 	#Build executables like block-attacher and system util GO binaries
-	docker build -t common-lib-builder --pull -f Dockerfile.builder .
+	go mod download
+	go run github.ibm.com/alchemy-containers/go-build-tools/cmd/goproxy -docker-build -- \
+		docker build -t common-lib-builder --pull -f Dockerfile.builder .
 	docker run common-lib-builder /bin/true
 	docker cp `docker ps -q -n=1`:/go/bin/systemutil ./systemutil
 	docker cp `docker ps -q -n=1`:/go/bin/block-storage-attacher ./block-storage-attacher

block-storage-attacher/OPENSOURCE

@@ -2,13 +2,16 @@ https://hub.docker.com/_/wcp-alchemy-containers-team-access-redhat-docker-remote
 github.com/BurntSushi/toml,v0.3.1
 github.com/blang/semver,v3.5.1+incompatible
 github.com/coreos/go-systemd/v22,v22.1.0
-github.com/onsi/ginkgo,v1.11.0
-github.com/onsi/gomega,v1.7.0
+github.com/onsi/ginkgo,v1.12.0
+github.com/onsi/gomega,v1.9.0
 github.com/opencontainers/selinux,v1.6.0
+github.com/pierrre/gotestcover,v0.0.0-20160517101806-924dca7d15f0
 github.com/satori/go.uuid,v1.2.0
+github.com/securego/gosec,v0.0.0-20200401082031-e946c8c39989
 github.com/spf13/viper,v1.7.1
 github.com/stretchr/testify,v1.4.0
 github.ibm.com/alchemy-containers/armada-opensource-lib,v0.4.4
+github.ibm.com/alchemy-containers/go-build-tools,v0.1.18
 go.uber.org/zap,v1.14.0
 golang.org/x/time,v0.0.0-20191024005414-555d28b269f0
 k8s.io/api,v0.19.2

block-storage-attacher/go.mod

@@ -6,12 +6,16 @@ require (
 	github.com/BurntSushi/toml v0.3.1
 	github.com/blang/semver v3.5.1+incompatible
 	github.com/coreos/go-systemd/v22 v22.1.0
-	github.com/onsi/ginkgo v1.11.0
-	github.com/onsi/gomega v1.7.0
+	github.com/onsi/ginkgo v1.12.0
+	github.com/onsi/gomega v1.9.0
 	github.com/opencontainers/selinux v1.6.0
+	github.com/pierrre/gotestcover v0.0.0-20160517101806-924dca7d15f0 // indirect
 	github.com/satori/go.uuid v1.2.0
+	github.com/securego/gosec v0.0.0-20200401082031-e946c8c39989 // indirect
 	github.com/spf13/viper v1.7.1
 	github.com/stretchr/testify v1.4.0
+	github.ibm.com/alchemy-containers/armada-opensource-lib v0.4.4 // indirect
+	github.ibm.com/alchemy-containers/go-build-tools v0.1.18 // indirect
 	go.uber.org/zap v1.14.0
 	golang.org/x/time v0.0.0-20191024005414-555d28b269f0
 	k8s.io/api v0.19.2