From 9c3188d43065864dd5b5e2e5531a2867272786e9 Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Wed, 16 Sep 2020 20:14:32 -0400 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 base images 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. Instead of merging this PR you can also create an alternate PR that includes the changes found here. If you believe the content of this PR is incorrect, please contact the dptp team in #aos-art. [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/images --- Dockerfile.openshift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.openshift b/Dockerfile.openshift index 29f5646d1..e8812e95c 100644 --- a/Dockerfile.openshift +++ b/Dockerfile.openshift @@ -1,5 +1,5 @@ # This dockerfile is specific to building Multus for OpenShift -FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6 as rhel8 +FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6 as rhel8 ADD . /usr/src/multus-cni WORKDIR /usr/src/multus-cni ENV CGO_ENABLED=1