From 5aa55766f11bdc9f53f4b8c20821502dbb8c0be2 Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Mon, 24 Aug 2020 19:07:41 +0000 Subject: [PATCH] Updating Dockerfile.openshift baseimages to mach ocp-build-data config This PR is autogenerated by the [ocp-build-data-enforcer][1]. It updates the baseimages in the Dockerfile used for promotion in order to ensure it matches the configuration in the [ocp-build-data repository][2] used for producing release artifacts. If you believe the content of this PR is incorrect, please contact the dptp team in #forum-testplatform. [1]: https://github.com/openshift/ci-tools/tree/master/cmd/ocp-build-data-enforcer [2]: https://github.com/openshift/ocp-build-data/tree/openshift-4.6-rhel-8/images --- Dockerfile.openshift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile.openshift b/Dockerfile.openshift index 757992e7d..29f5646d1 100644 --- a/Dockerfile.openshift +++ b/Dockerfile.openshift @@ -1,5 +1,5 @@ # This dockerfile is specific to building Multus for OpenShift -FROM openshift/origin-release:rhel-8-golang-1.12 as rhel8 +FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6 as rhel8 ADD . /usr/src/multus-cni WORKDIR /usr/src/multus-cni ENV CGO_ENABLED=1 @@ -9,7 +9,7 @@ RUN ./build && \ cd /usr/src/multus-cni/bin WORKDIR / -FROM openshift/origin-release:rhel-7-golang-1.12 as rhel7 +FROM registry.svc.ci.openshift.org/ocp/builder:rhel-7-golang-openshift-4.6 as rhel7 ADD . /usr/src/multus-cni WORKDIR /usr/src/multus-cni ENV CGO_ENABLED=1 @@ -23,7 +23,7 @@ RUN ./build && \ cd /usr/src/multus-cni/bin WORKDIR / -FROM openshift/origin-base +FROM registry.svc.ci.openshift.org/ocp/4.6:base RUN mkdir -p /usr/src/multus-cni/images && \ mkdir -p /usr/src/multus-cni/bin && \ mkdir -p /usr/src/multus-cni/rhel7/bin && \