Skip to content

Commit

Permalink
Merge pull request #122 from openshift-bot/art-consistency-openshift-…
Browse files Browse the repository at this point in the history
…4.15-ose-containernetworking-plugins

OCPBUGS-19127: Updating ose-containernetworking-plugins images to be consistent with ART
  • Loading branch information
openshift-merge-robot committed Sep 18, 2023
2 parents 4633865 + 58d274f commit 80a8df0
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Dockerfile
@@ -1,21 +1,21 @@
# This dockerfile is specific to building Multus for OpenShift
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.14 AS rhel9
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.15 AS rhel9
ADD . /usr/src/plugins
WORKDIR /usr/src/plugins
ENV CGO_ENABLED=0
RUN ./build_linux.sh && \
cd /usr/src/plugins/bin
WORKDIR /

FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.14 AS rhel8
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15 AS rhel8
ADD . /usr/src/plugins
WORKDIR /usr/src/plugins
ENV CGO_ENABLED=0
RUN ./build_linux.sh && \
cd /usr/src/plugins/bin
WORKDIR /

FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.14 AS windows
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15 AS windows
ADD . /usr/src/plugins
WORKDIR /usr/src/plugins
ENV CGO_ENABLED=0
Expand All @@ -24,7 +24,7 @@ RUN ./build_windows.sh && \
cd /usr/src/plugins/bin
WORKDIR /

FROM registry.ci.openshift.org/ocp/4.14:base
FROM registry.ci.openshift.org/ocp/4.15:base
RUN mkdir -p /usr/src/plugins/bin && \
mkdir -p /usr/src/plugins/rhel8/bin && \
mkdir -p /usr/src/plugins/rhel9/bin && \
Expand Down

0 comments on commit 80a8df0

Please sign in to comment.