Merge pull request #143 from egyptiankarim/master

Dockerfile Tweaks and Cleanup

Author: jsf9k

Dockerfile

@@ -1,18 +1,20 @@
 FROM python:3.6.3
 
-# Create an unprivileged user
+# Set up a workspace
 ENV PSHTT_HOME=/home/pshtt
-RUN mkdir ${PSHTT_HOME} 
+RUN mkdir ${PSHTT_HOME}
+
+# Create an unprivileged user
 RUN groupadd --system pshtt \
-    && useradd --system --comment="pshtt user" --gid="pshtt" pshtt
+  && useradd --system --comment="pshtt user" --gid="pshtt" pshtt
 
 # Install pshtt
 COPY . ${PSHTT_HOME}
 RUN chown -R pshtt:pshtt ${PSHTT_HOME}
 RUN pip install --no-cache ${PSHTT_HOME}
 
 # Prepare to run
-WORKDIR PSHTT_HOME
+WORKDIR ${PSHTT_HOME}
 USER pshtt:pshtt
 ENTRYPOINT ["pshtt"]
 CMD ["--help"]

entrypoint.sh

@@ -3,13 +3,9 @@
 set -e
 set -x
 
-
 docker build -t pshtt/cli .
 
 docker run --rm -it \
   --name pshtt \
-  -v $(pwd):/data \
-  `# Change the ownership of the files (**e.g** results) to the user with id 1042 and to the group with id 1042` \
-  -e USER_ID=1042 \
-  -e GROUP_ID=1042 \
+  -v $(pwd):/home/pshtt \
   pshtt/cli $@