Skip to content

Commit

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

Updating ose-containernetworking-plugins builder & base images to be consistent with ART
  • Loading branch information
openshift-merge-robot committed Jul 27, 2021
2 parents a8801b0 + 730dc55 commit 71a8b34
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Dockerfile
@@ -1,29 +1,29 @@
# 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
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
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
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 && \
Expand Down

0 comments on commit 71a8b34

Please sign in to comment.