Skip to content

Commit

Permalink
Merge "FAB-16852 Update Go to v1.12.12" into release-1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
denyeart authored and Gerrit Code Review committed Nov 7, 2019
2 parents 68093d0 + d7f8962 commit e7ed5e8
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 8 deletions.
10 changes: 7 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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 $@
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion ci.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
GO_VER=1.11.5
GO_VER=1.12.12
2 changes: 1 addition & 1 deletion common/metadata/metadata.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion devenv/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions images/testenv/Dockerfile.alpine
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down

0 comments on commit e7ed5e8

Please sign in to comment.