Use gosu instead of sudo for easier configuration

#879

diff --git a/Dockerfile b/Dockerfile
index 324983a0b1d04c953abae148706039cb478496fd..1527ebde8552d3f4b334a66b43c3967cb0e8fc56 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,7 +19,7 @@ RUN apt-get update \
                imagemagick \
                gettext \
                tzdata \
-               sudo \
+               gosu \
                # fonts for text file thumbnail generation
                fonts-liberation \
                # for Numpy
@@ -96,8 +96,8 @@ COPY src/ ./
 RUN addgroup --gid 1000 paperless \
        && useradd --uid 1000 --gid paperless --home-dir /usr/src/paperless paperless \
        && chown -R paperless:paperless ../ \
-       && sudo -HEu paperless python3 manage.py collectstatic --clear --no-input \
-       && sudo -HEu paperless python3 manage.py compilemessages
+       && gosu paperless python3 manage.py collectstatic --clear --no-input \
+       && gosu paperless python3 manage.py compilemessages
 
 VOLUME ["/usr/src/paperless/data", "/usr/src/paperless/media", "/usr/src/paperless/consume", "/usr/src/paperless/export"]
 ENTRYPOINT ["/sbin/docker-entrypoint.sh"]

diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index e9cfd2b7efd8012da1f7a0d91edc9d6cad951d4b..26df5f31a6c7286f04be79652ff710273bc40f26 100755 (executable)
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -34,7 +34,7 @@ initialize() {
        chown -R paperless:paperless /tmp/paperless
     set -e
 
-    sudo -HEu paperless /sbin/docker-prepare.sh
+    gosu paperless /sbin/docker-prepare.sh
 }
 
 install_languages() {
@@ -85,7 +85,7 @@ initialize
 
 if [[ "$1" != "/"* ]]; then
        echo Executing management command "$@"
-       exec sudo -HEu paperless python3 manage.py "$@"
+       exec gosu paperless python3 manage.py "$@"
 else
        echo Executing "$@"
        exec "$@"

diff --git a/docker/management_script.sh b/docker/management_script.sh
index bffa26e98144f72756fba2526abd74c9f4c293dc..a0d38f2bc563f6b189681902a3f564ae204db892 100755 (executable)
--- a/docker/management_script.sh
+++ b/docker/management_script.sh
@@ -6,7 +6,7 @@ cd /usr/src/paperless/src/
 
 if [[ $(id -u) == 0 ]] ;
 then
-  sudo -HEu paperless python3 manage.py management_command "$@"
+  gosu paperless python3 manage.py management_command "$@"
 elif [[ $(id -un) == "paperless" ]] ;
 then
   python3 manage.py management_command "$@"