Merge pull request #142 from openshift-bot/art-consistency-openshift-…

…4.6-ose-gcp-machine-controllers

Updating ose-gcp-machine-controllers builder & base images to be consistent with ART

Dockerfile.rhel

@@ -1,10 +1,10 @@
-FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6 AS builder
 WORKDIR /go/src/github.com/openshift/cluster-api-provider-gcp
 COPY . .
 # VERSION env gets set in the openshift/release image and refers to the golang version, which interfers with our own
 RUN unset VERSION \
  && make build GOPROXY=off NO_DOCKER=1 CGO_ENABLED=0
 
-FROM registry.svc.ci.openshift.org/ocp/4.6:base
+FROM registry.ci.openshift.org/ocp/4.6:base
 COPY --from=builder /go/src/github.com/openshift/cluster-api-provider-gcp/bin/machine-controller-manager /
 COPY --from=builder /go/src/github.com/openshift/cluster-api-provider-gcp/bin/termination-handler /