diff --git a/Makefile b/Makefile index 9bd555b0388..fdef96546b7 100755 --- a/Makefile +++ b/Makefile @@ -47,7 +47,7 @@ BASE_VERSION = 1.4.10 PREV_VERSION = 1.4.9 CHAINTOOL_RELEASE=1.1.3 -BASEIMAGE_RELEASE=0.4.21 +BASEIMAGE_RELEASE=0.4.22 # Allow to build as a submodule setting the main project to # the PROJECT_NAME env variable, for example, diff --git a/ci/azure-pipelines-merge.yml b/ci/azure-pipelines-merge.yml index 487142da5b0..1a31ed756b5 100644 --- a/ci/azure-pipelines-merge.yml +++ b/ci/azure-pipelines-merge.yml @@ -10,7 +10,7 @@ pr: none variables: GOPATH: $(Agent.BuildDirectory)/go PATH: $(Agent.BuildDirectory)/go/bin:/usr/local/go/bin:/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin - GOVER: 1.13.12 + GOVER: 1.14.12 jobs: - job: UnitTests diff --git a/ci/azure-pipelines-release.yml b/ci/azure-pipelines-release.yml index f03e5393924..2521222cace 100644 --- a/ci/azure-pipelines-release.yml +++ b/ci/azure-pipelines-release.yml @@ -11,7 +11,7 @@ variables: - name: GOPATH value: $(Agent.BuildDirectory)/go - name: GOVER - value: 1.13.12 + value: 1.14.12 stages: - stage: BuildBinaries diff --git a/ci/azure-pipelines.yml b/ci/azure-pipelines.yml index 0b5d47f9ad9..cea97336b1c 100644 --- a/ci/azure-pipelines.yml +++ b/ci/azure-pipelines.yml @@ -10,7 +10,7 @@ pr: variables: GOPATH: $(Agent.BuildDirectory)/go PATH: $(Agent.BuildDirectory)/go/bin:/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin - GOVER: 1.13.12 + GOVER: 1.14.12 jobs: - job: VerifyBuild diff --git a/devenv/setup.sh b/devenv/setup.sh index c9b3e26c5ea..fbca5cf4623 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.13.12 +GO_VER=1.14.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 c1a26657259..96f27a23a03 100644 --- a/images/testenv/Dockerfile.alpine +++ b/images/testenv/Dockerfile.alpine @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: Apache-2.0 # -FROM golang:1.13.12-alpine as builder +FROM golang:1.14.12-alpine as builder RUN apk add --no-cache \ alpine-sdk \ diff --git a/integration/e2e/health_test.go b/integration/e2e/health_test.go index 65fb9b5e7f2..33e47b2bfd9 100644 --- a/integration/e2e/health_test.go +++ b/integration/e2e/health_test.go @@ -146,7 +146,7 @@ var _ = Describe("Health", func() { statusCode, status = DoHealthCheck(authClient, healthURL) Expect(status.Status).To(Equal("Service Unavailable")) Expect(status.FailedChecks[0].Component).To(Equal("couchdb")) - Expect(status.FailedChecks[0].Reason).Should((HavePrefix(fmt.Sprintf("failed to connect to couch db [http error calling couchdb: Head http://%s: dial tcp %s: ", couchAddr, couchAddr)))) + Expect(status.FailedChecks[0].Reason).Should(HavePrefix(fmt.Sprintf(`failed to connect to couch db [http error calling couchdb: Head "http://%s": dial tcp %s: `, couchAddr, couchAddr))) }) }) })