Merge pull request #369 from openshift-bot/art-consistency-openshift-4.7-telemeter

Updating telemeter builder & base images to be consistent with ART

Author: jupierce

Dockerfile

@@ -1,12 +1,12 @@
-FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.7
+FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.7
 ENV GOFLAGS="-mod=vendor"
 COPY . /go/src/github.com/openshift/telemeter
 RUN cd /go/src/github.com/openshift/telemeter && \
     go build ./cmd/telemeter-client && \
     go build ./cmd/telemeter-server && \
     go build ./cmd/authorization-server
 
-FROM registry.svc.ci.openshift.org/ocp/4.7:base
+FROM registry.ci.openshift.org/ocp/4.7:base
 LABEL io.k8s.display-name="OpenShift Telemeter" \
       io.k8s.description="" \
       io.openshift.tags="openshift,monitoring" \