Skip to content

Bug 1872080: Updating Dockerfile.openshift baseimages to mach ocp-build-data config #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Aug 25, 2020
Merged

Bug 1872080: Updating Dockerfile.openshift baseimages to mach ocp-build-data config #77

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Dockerfile.openshift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This dockerfile is specific to building Multus for OpenShift
FROM openshift/origin-release:rhel-8-golang-1.12 as rhel8
FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6 as rhel8
ADD . /usr/src/multus-cni
WORKDIR /usr/src/multus-cni
ENV CGO_ENABLED=1
Expand All @@ -9,7 +9,7 @@ RUN ./build && \
cd /usr/src/multus-cni/bin
WORKDIR /

FROM openshift/origin-release:rhel-7-golang-1.12 as rhel7
FROM registry.svc.ci.openshift.org/ocp/builder:rhel-7-golang-openshift-4.6 as rhel7
ADD . /usr/src/multus-cni
WORKDIR /usr/src/multus-cni
ENV CGO_ENABLED=1
Expand All @@ -23,7 +23,7 @@ RUN ./build && \
cd /usr/src/multus-cni/bin
WORKDIR /

FROM openshift/origin-base
FROM registry.svc.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 && \
Expand Down