Merge pull request openshift#698 from openshift-bot/updating-dockerfi…

…le-baseimages-to-mach-ocp-build-data-config

Bug 1878163: Updating Dockerfile baseimages to mach ocp-build-data config

Dockerfile

@@ -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-logging-operator
 
 # COPY steps are in the reverse order of frequency of change
@@ -19,7 +19,7 @@ RUN make build
 
 FROM registry.svc.ci.openshift.org/ocp/4.6:cli as origincli
 
-FROM registry.svc.ci.openshift.org/ocp/4.6:base-8
+FROM registry.svc.ci.openshift.org/ocp/4.6:base
 RUN INSTALL_PKGS=" \
       openssl \
       rsync \