Merge pull request #457 from wking/go-1.15

openshift-merge-robot · web-flow · commit 02467f9ad01a · 2020-09-17T14:59:41.000-04:00
Bug 1878163: Dockerfile.rhel: Bump to Go 1.15
diff --git a/Dockerfile.rhel b/Dockerfile.rhel
@@ -1,4 +1,4 @@
-FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6 AS builder
+FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6 AS builder
 WORKDIR /go/src/github.com/openshift/cluster-version-operator
 COPY . .
 RUN hack/build-go.sh; \

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6 AS builder`
	`1`	`+FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6 AS builder`
`2`	`2`	`WORKDIR /go/src/github.com/openshift/cluster-version-operator`
`3`	`3`	`COPY . .`
`4`	`4`	`RUN hack/build-go.sh; \`