Skip to content

Commit

Permalink
Updating multus-cni images to be consistent with ART
Browse files Browse the repository at this point in the history
  • Loading branch information
AOS Automation Release Team committed Sep 15, 2021
1 parent 5e081d5 commit 93d9416
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Dockerfile.openshift
@@ -1,5 +1,5 @@
# This dockerfile is specific to building Multus for OpenShift
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.9 AS rhel8
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.10 AS rhel8
ADD . /usr/src/multus-cni
WORKDIR /usr/src/multus-cni
ENV CGO_ENABLED=1
Expand All @@ -9,7 +9,7 @@ RUN ./hack/build-go.sh && \
cd /usr/src/multus-cni/bin
WORKDIR /

FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.9 AS rhel7
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.10 AS rhel7
ADD . /usr/src/multus-cni
WORKDIR /usr/src/multus-cni
ENV CGO_ENABLED=1
Expand All @@ -24,7 +24,7 @@ RUN ./hack/build-go.sh && \
RUN ls -lathr /usr/src/multus-cni/bin/multus
WORKDIR /

FROM registry.ci.openshift.org/ocp/4.9:base
FROM registry.ci.openshift.org/ocp/4.10:base
RUN mkdir -p /usr/src/multus-cni/images && \
mkdir -p /usr/src/multus-cni/bin && \
mkdir -p /usr/src/multus-cni/rhel7/bin && \
Expand Down

0 comments on commit 93d9416

Please sign in to comment.