From 70674f9db5c4cdb0bff0bb113685571d4b1fb785 Mon Sep 17 00:00:00 2001 From: Semantic Versioner Date: Tue, 6 Aug 2019 15:23:51 -0400 Subject: [PATCH 1/2] Reorganize and Restructure --- Dockerfile | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index da44a1a..aeeb77b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,20 +1,31 @@ -FROM centos:7 +FROM centos/python-36-centos7 MAINTAINER RightBrain Networks "ops+docker@rightbrainnetworks.com" -RUN yum update -y && yum install -y epel-release +USER root +#Perform updates +RUN pip install --upgrade pip +RUN yum update -y + +#Install reqs +RUN yum install -y epel-release RUN yum install -y git -RUN yum install -y python-pip -RUN pip install --upgrade pip - -RUN useradd -d /semver semver +#Setup semver +ADD / /semver WORKDIR /semver - -ADD ./ /semver -RUN chmod -R +r /semver && chmod +x /semver - RUN pip install -e . -CMD semver && semver_get_version +# Prep workspace +RUN mkdir /workspace +WORKDIR /workspace +VOLUME /workspace + +#Permissions +RUN useradd -d /semverUser semverUser +RUN chown -R semverUser:semverUser /workspace + +CMD /opt/app-root/bin/semver + +USER semverUser \ No newline at end of file From f1ca13bcc3002a6f44eb81e848772685ae45a6c4 Mon Sep 17 00:00:00 2001 From: Semantic Versioner Date: Thu, 8 Aug 2019 12:48:16 -0400 Subject: [PATCH 2/2] Cleaned up Dockerfile --- Dockerfile | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index aeeb77b..1b7938b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,21 +1,16 @@ FROM centos/python-36-centos7 - -MAINTAINER RightBrain Networks "ops+docker@rightbrainnetworks.com" - + USER root #Perform updates RUN pip install --upgrade pip RUN yum update -y -#Install reqs -RUN yum install -y epel-release -RUN yum install -y git - #Setup semver ADD / /semver WORKDIR /semver -RUN pip install -e . +RUN python setup.py sdist +RUN pip install dist/semver-*.tar.gz # Prep workspace RUN mkdir /workspace @@ -26,6 +21,6 @@ VOLUME /workspace RUN useradd -d /semverUser semverUser RUN chown -R semverUser:semverUser /workspace -CMD /opt/app-root/bin/semver +ENTRYPOINT [ "semver" ] USER semverUser \ No newline at end of file