Clean up and update dockerfile [ci skip]

Author: binoculars

.dockerignore

@@ -1,3 +1,4 @@
 .git
 *.pyc
 **/*.pyc
+Dockerfile

Dockerfile

@@ -1,8 +1,11 @@
 FROM python:3.5-slim
 
-RUN usermod -d /home www-data && chown www-data:www-data /home
+# ensure unoconv can locate the uno library
+ENV PYTHONPATH=/usr/lib/python3/dist-packages
 
-RUN apt-get update \
+RUN usermod -d /home www-data \
+    && chown www-data:www-data /home \
+    && apt-get update \
     # mfr dependencies
     && apt-get install -y \
         git \
@@ -19,49 +22,39 @@ RUN apt-get update \
         libxml2-dev \
         libxslt1-dev \
         zlib1g-dev \
-    # unoconv dependencies
-    && apt-get install -y \
+        # unoconv dependencies
         unoconv \
-    # pspp dependencies
-    && apt-get install -y \
+        # pspp dependencies
         pspp \
-    && apt-get clean \
-    && apt-get autoremove -y \
-    && rm -rf /var/lib/apt/lists/*
-
-# grab gosu for easy step-down from root
-ENV GOSU_VERSION 1.4
-RUN apt-get update \
-    && apt-get install -y \
+        # gosu dependencies
         curl \
+    # gosu
+    && export GOSU_VERSION='1.10' \
     && gpg --keyserver pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
     && curl -o /usr/local/bin/gosu -SL "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
   	&& curl -o /usr/local/bin/gosu.asc -SL "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \
   	&& gpg --verify /usr/local/bin/gosu.asc \
   	&& rm /usr/local/bin/gosu.asc \
   	&& chmod +x /usr/local/bin/gosu \
+    # /gosu
     && apt-get clean \
     && apt-get autoremove -y \
         curl \
-    && rm -rf /var/lib/apt/lists/*
-
-# ensure unoconv can locate the uno library
-ENV PYTHONPATH=/usr/lib/python3/dist-packages
+    && rm -rf /var/lib/apt/lists/* \
+    && pip install -U pip \
+    && pip uninstall -y setuptools \
+    && rm -f /usr/local/lib/python3.5/site-packages/mfr-nspkg.pth \
+    && pip install setuptools==30.4.0 \
+    && mkdir -p /code
 
-RUN mkdir -p /code
 WORKDIR /code
 
-RUN pip install -U pip
-RUN pip uninstall -y setuptools
-RUN rm -f /usr/local/lib/python3.5/site-packages/mfr-nspkg.pth
-RUN pip install setuptools==30.4.0
-
-COPY ./requirements.txt /code/
+COPY ./requirements.txt ./
 
-RUN pip install --no-cache-dir -r /code/requirements.txt
+RUN pip install --no-cache-dir -r ./requirements.txt
 
 # Copy the rest of the code over
-COPY ./ /code/
+COPY ./ ./
 
 ARG GIT_COMMIT=
 ENV GIT_COMMIT ${GIT_COMMIT}
@@ -70,4 +63,4 @@ RUN python setup.py develop
 
 EXPOSE 7778
 
-CMD ["gosu", "nobody", "invoke", "server"]
+CMD ["gosu", "www-data", "invoke", "server"]