Merge pull request #22860 from smarterclayton/golang112

openshift-merge-robot · web-flow · commit 2183af56c394 · 2019-05-19T13:49:39.000+02:00
Switch to golang-1.12 for image builds
diff --git a/images/cli-artifacts/Dockerfile.rhel b/images/cli-artifacts/Dockerfile.rhel
@@ -2,7 +2,7 @@
 # It builds an image containing the Mac version of the installer layered on top of the
 # Linux installer image.
 
-FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.11 AS builder
+FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.12 AS builder
 WORKDIR /go/src/github.com/openshift/origin
 COPY . .
 RUN OS_RELEASE_WITHOUT_LINKS=y OS_BUILD_RELEASE_ARCHIVES=n OS_ONLY_BUILD_PLATFORMS="^(darwin|windows)/amd64$" bash -x hack/build-cross.sh
diff --git a/images/cli/Dockerfile.rhel b/images/cli/Dockerfile.rhel
@@ -1,4 +1,4 @@
-FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.11 AS builder
+FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.12 AS builder
 WORKDIR /go/src/github.com/openshift/origin
 COPY . .
 RUN make build WHAT=cmd/oc; \
diff --git a/images/hyperkube/Dockerfile.rhel b/images/hyperkube/Dockerfile.rhel
@@ -1,4 +1,4 @@
-FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.11 AS builder
+FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.12 AS builder
 WORKDIR /go/src/github.com/openshift/origin
 COPY . .
 RUN make build WHAT=vendor/k8s.io/kubernetes/cmd/hyperkube; \
diff --git a/images/hypershift/Dockerfile.rhel b/images/hypershift/Dockerfile.rhel
@@ -1,4 +1,4 @@
-FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.11 AS builder
+FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.12 AS builder
 WORKDIR /go/src/github.com/openshift/origin
 COPY . .
 RUN make build WHAT=cmd/hypershift; \
diff --git a/images/sdn/Dockerfile.rhel b/images/sdn/Dockerfile.rhel
@@ -1,4 +1,4 @@
-FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.11 AS builder
+FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.12 AS builder
 WORKDIR /go/src/github.com/openshift/origin
 COPY . .
 RUN make build WHAT=" \
diff --git a/images/template-service-broker/Dockerfile.rhel b/images/template-service-broker/Dockerfile.rhel
@@ -1,4 +1,4 @@
-FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.11 AS builder
+FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.12 AS builder
 WORKDIR /go/src/github.com/openshift/origin
 COPY . .
 RUN make build WHAT=cmd/template-service-broker; \
diff --git a/images/tests/Dockerfile.rhel b/images/tests/Dockerfile.rhel
@@ -1,4 +1,4 @@
-FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.11 AS builder
+FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.12 AS builder
 WORKDIR /go/src/github.com/openshift/origin
 COPY . .
 RUN make build WHAT=cmd/openshift-tests; \

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.11 AS builder`
	`1`	`+FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.12 AS builder`
`2`	`2`	`WORKDIR /go/src/github.com/openshift/origin`
`3`	`3`	`COPY . .`
`4`	`4`	`RUN make build WHAT=cmd/oc; \`