From 6880d9eb3b367b488a1686a2b42ed994a159e04c Mon Sep 17 00:00:00 2001 From: dougbtv Date: Mon, 7 Jan 2019 11:36:56 -0500 Subject: [PATCH] [dockerfile] Updates Dockerfile for OpenShift-style build --- Dockerfile.openshift | 20 ++++++++++++++++++++ Dockerfile.rhel | 28 ---------------------------- 2 files changed, 20 insertions(+), 28 deletions(-) create mode 100644 Dockerfile.openshift delete mode 100644 Dockerfile.rhel diff --git a/Dockerfile.openshift b/Dockerfile.openshift new file mode 100644 index 000000000..de88066f1 --- /dev/null +++ b/Dockerfile.openshift @@ -0,0 +1,20 @@ +# This dockerfile is specific to building Multus for OpenShift +FROM openshift/origin-release:golang-1.10 as builder + +ADD . /usr/src/multus-cni + +WORKDIR /usr/src/multus-cni +RUN ./build + +FROM openshift/origin-base +RUN mkdir -p /usr/src/multus-cni/images && mkdir -p /usr/src/multus-cni/bin +COPY --from=builder /usr/src/multus-cni/images/70-multus.conf /usr/src/multus-cni/images +COPY --from=builder /usr/src/multus-cni/bin/multus /usr/src/multus-cni/bin +ADD ./images/entrypoint.sh / + +LABEL io.k8s.display-name="Multus CNI" \ + io.k8s.description="This is a component of OpenShift Container Platform and provides a meta CNI plugin." \ + io.openshift.tags="openshift" \ + maintainer="Doug Smith " + +ENTRYPOINT ["/entrypoint.sh"] \ No newline at end of file diff --git a/Dockerfile.rhel b/Dockerfile.rhel deleted file mode 100644 index 2268d6b0f..000000000 --- a/Dockerfile.rhel +++ /dev/null @@ -1,28 +0,0 @@ -# This dockerfile is specific to building Multus for OpenShift -FROM rhel:rhel7 - -# Add everything -ADD . /usr/src/multus-cni - -ENV INSTALL_PKGS "git golang" -RUN yum install -y $INSTALL_PKGS && \ - rpm -V $INSTALL_PKGS && \ - cd /usr/src/multus-cni && \ - ./build && \ - yum autoremove -y $INSTALL_PKGS && \ - yum clean all && \ - rm -rf /tmp/* - -WORKDIR / - -LABEL io.k8s.display-name="Multus CNI" \ - io.k8s.description="This is a component of OpenShift Container Platform and provides a meta CNI plugin." \ - io.openshift.tags="openshift" \ - maintainer="Doug Smith " - -ADD ./images/entrypoint.sh / - -# does it require a root user? -# USER 1001 - -ENTRYPOINT ["/entrypoint.sh"]