Merge pull request #41 from openshift-bot/art-consistency-openshift-4.7-golang-github-prometheus-alertmanager

Updating golang-github-prometheus-alertmanager builder & base images to be consistent with ART

Author: openshift-merge-robot

Dockerfile.ocp

@@ -1,10 +1,10 @@
 # FROM directives are overriden by CI system (both Prow CI and OSBS)
-FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.7 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.7 AS builder
 WORKDIR /go/src/github.com/prometheus/alertmanager
 COPY . .
 RUN if yum install -y prometheus-promu; then export BUILD_PROMU=false; fi && make build
 
-FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-base-openshift-4.7
+FROM registry.ci.openshift.org/ocp/builder:rhel-8-base-openshift-4.7
 LABEL io.k8s.display-name="OpenShift Prometheus Alert Manager" \
       io.k8s.description="Prometheus Alert Manager" \
       io.openshift.tags="prometheus,monitoring" \