From 730dc559c441966b2a0f424415a8b1470881602c Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Tue, 25 May 2021 21:00:45 +0000 Subject: [PATCH] Updating ose-containernetworking-plugins images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/296ac244f3e7fd2d937316639892f90f158718b0/images/ose-containernetworking-plugins.yml --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 02c7add6..d1443a6a 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-1.15-openshift-4.7 AS rhel8 +FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.8 AS rhel8 ADD . /usr/src/plugins WORKDIR /usr/src/plugins ENV CGO_ENABLED=0 @@ -7,7 +7,7 @@ RUN ./build_linux.sh && \ cd /usr/src/plugins/bin WORKDIR / -FROM registry.svc.ci.openshift.org/ocp/builder:rhel-7-golang-1.15-openshift-4.7 AS rhel7 +FROM registry.ci.openshift.org/ocp/builder:rhel-7-golang-1.16-openshift-4.8 AS rhel7 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-1.15-openshift-4.7 AS windows +FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.8 AS windows ADD . /usr/src/plugins WORKDIR /usr/src/plugins ENV CGO_ENABLED=0 @@ -23,7 +23,7 @@ RUN ./build_windows.sh && \ cd /usr/src/plugins/bin WORKDIR / -FROM registry.svc.ci.openshift.org/ocp/4.7:base +FROM registry.ci.openshift.org/ocp/4.8:base RUN mkdir -p /usr/src/plugins/bin && \ mkdir -p /usr/src/plugins/rhel7/bin && \ mkdir -p /usr/src/plugins/rhel8/bin && \