From 0b71f3344ced7db31f725adeeae6ed547d948e81 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 31 Oct 2019 10:37:11 -0400 Subject: [PATCH] build for rhel7 and rhel8 userspaces Dockerfile template from Doug Smith Signed-off-by: Lokesh Mandvekar --- Dockerfile | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 37aaee0c..ab1c5795 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,21 +1,30 @@ # This dockerfile is specific to building Multus for OpenShift -FROM openshift/origin-release:golang-1.10 as builder - -# Add everything +FROM openshift/origin-release:rhel-8-golang-1.12 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 openshift/origin-release:rhel-7-golang-1.12 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 openshift/origin-base -RUN mkdir -p /usr/src/plugins/bin -COPY --from=builder /usr/src/plugins/bin/* /usr/src/plugins/bin/ +RUN mkdir -p /usr/src/plugins/bin && \ + mkdir -p /usr/src/plugins/rhel7/bin && \ + mkdir -p /usr/src/plugins/rhel8/bin +COPY --from=rhel7 /usr/src/plugins/bin/* /usr/src/plugins/rhel7/bin/ +COPY --from=rhel7 /usr/src/plugins/bin/* /usr/src/plugins/bin/ +COPY --from=rhel8 /usr/src/plugins/bin/* /usr/src/plugins/rhel8/bin/ LABEL io.k8s.display-name="Container Networking Plugins" \ io.k8s.description="This is a component of OpenShift Container Platform and provides the reference CNI plugins." \ io.openshift.tags="openshift" \ maintainer="Doug Smith " +