From d7f89627f71ccf47f43c6c6e36b6132f8b5c7d8d Mon Sep 17 00:00:00 2001
From: Jason Yellick <jyellick@us.ibm.com>
Date: Mon, 28 Oct 2019 13:20:43 -0400
Subject: [PATCH] FAB-16852 Update Go to v1.12.12

Go version v1.11 has gone EOL and is no longer supported.  Bumping to a
supported rev of golang.

Signed-off-by: Jason Yellick <jyellick@us.ibm.com>
Change-Id: Ia0966eda30c4a096896aa859feddec052e3e8083
---
 Makefile                         | 10 +++++++---
 ci.properties                    |  2 +-
 common/metadata/metadata.go      |  2 +-
 devenv/setup.sh                  |  2 +-
 images/testenv/Dockerfile.alpine |  4 ++--
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index c008b43c742..05df2c77e11 100755
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,7 @@
 BASE_VERSION = 1.4.4
 PREV_VERSION = 1.4.3
 CHAINTOOL_RELEASE=1.1.3
-BASEIMAGE_RELEASE=0.4.16
+BASEIMAGE_RELEASE=0.4.18
 
 # Allow to build as a submodule setting the main project to
 # the PROJECT_NAME env variable, for example,
@@ -231,10 +231,12 @@ $(BUILD_DIR)/%/chaintool: Makefile
 $(BUILD_DIR)/docker/bin/%: $(PROJECT_FILES)
 	$(eval TARGET = ${patsubst $(BUILD_DIR)/docker/bin/%,%,${@}})
 	@echo "Building $@"
-	@mkdir -p $(BUILD_DIR)/docker/bin $(BUILD_DIR)/docker/$(TARGET)/pkg
+	@mkdir -p $(BUILD_DIR)/docker/bin $(BUILD_DIR)/docker/$(TARGET)/pkg $(BUILD_DIR)/docker/gocache
 	@$(DRUN) \
 		-v $(abspath $(BUILD_DIR)/docker/bin):/opt/gopath/bin \
 		-v $(abspath $(BUILD_DIR)/docker/$(TARGET)/pkg):/opt/gopath/pkg \
+		-v $(abspath $(BUILD_DIR)/docker/gocache):/opt/gopath/cache \
+		-e GOCACHE=/opt/gopath/cache \
 		$(BASE_DOCKER_NS)/fabric-baseimage:$(BASE_DOCKER_TAG) \
 		go install -tags "$(GO_TAGS)" -ldflags "$(DOCKER_GO_LDFLAGS)" $(pkgmap.$(@F))
 	@touch $@
@@ -249,10 +251,12 @@ $(BUILD_DIR)/docker/gotools/bin/protoc-gen-go: $(BUILD_DIR)/docker/gotools
 
 $(BUILD_DIR)/docker/gotools: gotools.mk
 	@echo "Building dockerized gotools"
-	@mkdir -p $@/bin $@/obj
+	@mkdir -p $@/bin $@/obj $(BUILD_DIR)/docker/gocache
 	@$(DRUN) \
 		-v $(abspath $@):/opt/gotools \
 		-w /opt/gopath/src/$(PKGNAME) \
+		-v $(abspath $(BUILD_DIR)/docker/gocache):/opt/gopath/cache \
+		-e GOCACHE=/opt/gopath/cache \
 		$(BASE_DOCKER_NS)/fabric-baseimage:$(BASE_DOCKER_TAG) \
 		make -f gotools.mk GOTOOLS_BINDIR=/opt/gotools/bin GOTOOLS_GOPATH=/opt/gotools/obj
 
diff --git a/ci.properties b/ci.properties
index fd91c5d8103..b1e10182297 100644
--- a/ci.properties
+++ b/ci.properties
@@ -1 +1 @@
-GO_VER=1.11.5
+GO_VER=1.12.12
diff --git a/common/metadata/metadata.go b/common/metadata/metadata.go
index 961fa42d884..86b5e49c41f 100644
--- a/common/metadata/metadata.go
+++ b/common/metadata/metadata.go
@@ -9,7 +9,7 @@ package metadata
 // Variables defined by the Makefile and passed in with ldflags
 var Version string = "latest"
 var CommitSHA string = "development build"
-var BaseVersion string = "0.4.16"
+var BaseVersion string = "0.4.18"
 var BaseDockerLabel string = "org.hyperledger.fabric"
 var DockerNamespace string = "hyperledger"
 var BaseDockerNamespace string = "hyperledger"
diff --git a/devenv/setup.sh b/devenv/setup.sh
index c19ee46e737..353dd64e148 100755
--- a/devenv/setup.sh
+++ b/devenv/setup.sh
@@ -60,7 +60,7 @@ docker run --rm busybox echo All good
 # ----------------------------------------------------------------
 # Install Golang
 # ----------------------------------------------------------------
-GO_VER=1.11.5
+GO_VER=1.12.12
 GO_URL=https://storage.googleapis.com/golang/go${GO_VER}.linux-amd64.tar.gz
 
 # Set Go environment variables needed by other scripts
diff --git a/images/testenv/Dockerfile.alpine b/images/testenv/Dockerfile.alpine
index d973877041e..42f9fe9eb45 100644
--- a/images/testenv/Dockerfile.alpine
+++ b/images/testenv/Dockerfile.alpine
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-FROM golang:1.11-alpine as builder
+FROM golang:1.12-alpine as builder
 
 RUN apk add --no-cache \
 	alpine-sdk \
@@ -35,7 +35,7 @@ USER root
 WORKDIR $GOPATH/src/github.com/hyperledger/fabric
 RUN EXECUTABLES= make gotools
 
-FROM golang:1.11-alpine
+FROM golang:1.12-alpine
 RUN apk add --no-cache \
 	gcc \
 	bash \