github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-04-27 19:25:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #85 from openshift-bot/art-consistency-openshift-4.6-multus-cni

Browse Source 
Updating multus-cni builder & base images to be consistent with ART
This commit is contained in:
OpenShift Merge Robot 2021-01-14 18:51:37 -05:00 committed by GitHub
commit 30668ec22b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile.openshift
View File

@ -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.6 as rhel8
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6 AS rhel8
ADD . /usr/src/multus-cni
WORKDIR /usr/src/multus-cni
ENV CGO_ENABLED=1
@ -9,7 +9,7 @@ RUN ./build && \
cd /usr/src/multus-cni/bin
WORKDIR /
FROM registry.svc.ci.openshift.org/ocp/builder:rhel-7-golang-1.15-openshift-4.6 AS rhel7
FROM registry.ci.openshift.org/ocp/builder:rhel-7-golang-1.15-openshift-4.6 AS rhel7
ADD . /usr/src/multus-cni
WORKDIR /usr/src/multus-cni
ENV CGO_ENABLED=1
@ -23,7 +23,7 @@ RUN ./build && \
cd /usr/src/multus-cni/bin
WORKDIR /
FROM registry.svc.ci.openshift.org/ocp/4.6:base
FROM registry.ci.openshift.org/ocp/4.6:base
RUN mkdir -p /usr/src/multus-cni/images && \
mkdir -p /usr/src/multus-cni/bin && \
mkdir -p /usr/src/multus-cni/rhel7/bin && \