From e5e020f6a3d72facd0741c78e5983b0ab585fb21 Mon Sep 17 00:00:00 2001 From: dougbtv Date: Tue, 4 Dec 2018 21:08:09 -0500 Subject: [PATCH] [dockerfile] Adds Dockerfile.rhel for OpenShift build --- Dockerfile | 9 +-------- Dockerfile.rhel | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 8 deletions(-) create mode 100644 Dockerfile.rhel diff --git a/Dockerfile b/Dockerfile index 15a17a184..a57b90c4e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,4 @@ +# This Dockerfile is used to build the image available on DockerHub FROM centos:centos7 # Add everything @@ -16,14 +17,6 @@ RUN rpm --import https://mirror.go-repo.io/centos/RPM-GPG-KEY-GO-REPO && \ 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"] diff --git a/Dockerfile.rhel b/Dockerfile.rhel new file mode 100644 index 000000000..2268d6b0f --- /dev/null +++ b/Dockerfile.rhel @@ -0,0 +1,28 @@ +# 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"]