From 8dbcf87d14dc6e7ccc81b8a8ba9ebe8a06bf223b Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Wed, 16 Sep 2020 20:05:57 -0400 Subject: [PATCH] Updating Dockerfile 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index bb0af613..ac81f812 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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/plugins WORKDIR /usr/src/plugins ENV CGO_ENABLED=0 @@ -15,7 +15,7 @@ RUN ./build_linux.sh && \ cd /usr/src/plugins/bin WORKDIR / -FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6 as windows +FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6 as windows ADD . /usr/src/plugins WORKDIR /usr/src/plugins ENV CGO_ENABLED=0