From b5bef13b46010980aeaa7c061513fb1df3807ea7 Mon Sep 17 00:00:00 2001 From: Sven Fischer Date: Sat, 8 Apr 2017 23:58:21 +0200 Subject: [PATCH 1/3] Docker: prepare export directory --- Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 31e414657..1133835bb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,12 +35,17 @@ RUN groupadd -g 1000 paperless \ && useradd -u 1000 -g 1000 -d /usr/src/paperless paperless \ && chown -Rh paperless:paperless /usr/src/paperless +# Set export directory +ENV PAPERLESS_EXPORT_DIR /export +RUN mkdir -p $PAPERLESS_EXPORT_DIR +RUN chown -Rh paperless:paperless $PAPERLESS_EXPORT_DIR + # Setup entrypoint COPY scripts/docker-entrypoint.sh /sbin/docker-entrypoint.sh RUN chmod 755 /sbin/docker-entrypoint.sh # Mount volumes -VOLUME ["/usr/src/paperless/data", "/usr/src/paperless/media", "/consume"] +VOLUME ["/usr/src/paperless/data", "/usr/src/paperless/media", "/consume", "/export"] ENTRYPOINT ["/sbin/docker-entrypoint.sh"] CMD ["--help"] From 4c05a511c253b2f6b73a398475e6a815144b0e05 Mon Sep 17 00:00:00 2001 From: Sven Fischer Date: Tue, 2 May 2017 19:06:01 +0200 Subject: [PATCH 2/3] Docker: review fix: if end-user host-mounts the export directory --- Dockerfile | 1 - scripts/docker-entrypoint.sh | 42 +++++++++++++++++++----------------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1133835bb..f661012b5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,7 +38,6 @@ RUN groupadd -g 1000 paperless \ # Set export directory ENV PAPERLESS_EXPORT_DIR /export RUN mkdir -p $PAPERLESS_EXPORT_DIR -RUN chown -Rh paperless:paperless $PAPERLESS_EXPORT_DIR # Setup entrypoint COPY scripts/docker-entrypoint.sh /sbin/docker-entrypoint.sh diff --git a/scripts/docker-entrypoint.sh b/scripts/docker-entrypoint.sh index 7a5e26897..d3894fb78 100644 --- a/scripts/docker-entrypoint.sh +++ b/scripts/docker-entrypoint.sh @@ -15,26 +15,28 @@ map_uidgid() { } set_permissions() { - # Set permissions for consumption directory - chgrp paperless "$PAPERLESS_CONSUMPTION_DIR" || { - echo "Changing group of consumption directory:" - echo " $PAPERLESS_CONSUMPTION_DIR" - echo "failed." - echo "" - echo "Either try to set it on your host-mounted directory" - echo "directly, or make sure that the directory has \`o+x\`" - echo "permissions and the files in it at least \`o+r\`." - } >&2 - chmod g+x "$PAPERLESS_CONSUMPTION_DIR" || { - echo "Changing group permissions of consumption directory:" - echo " $PAPERLESS_CONSUMPTION_DIR" - echo "failed." - echo "" - echo "Either try to set it on your host-mounted directory" - echo "directly, or make sure that the directory has \`o+x\`" - echo "permissions and the files in it at least \`o+r\`." - } >&2 - + # Set permissions for consumption and export directory + for i in PAPERLESS_CONSUMPTION_DIR PAPERLESS_EXPORT_DIR; do + cur_dir_name=$(sed -e's/PAPERLESS_//; s/_DIR//' <<< $i | tr '[:upper:]' '[:lower:]') + chgrp paperless "${!i}" || { + echo "Changing group of ${cur_dir_name} directory:" + echo " ${!i}" + echo "failed." + echo "" + echo "Either try to set it on your host-mounted directory" + echo "directly, or make sure that the directory has \`o+x\`" + echo "permissions and the files in it at least \`o+r\`." + } >&2 + chmod g+x "${!i}" || { + echo "Changing group permissions of ${cur_dir_name} directory:" + echo " ${!i}" + echo "failed." + echo "" + echo "Either try to set it on your host-mounted directory" + echo "directly, or make sure that the directory has \`o+x\`" + echo "permissions and the files in it at least \`o+r\`." + } >&2 + done # Set permissions for application directory chown -Rh paperless:paperless /usr/src/paperless } From b2b6cbe9c85764a8071638b91ec3abb115f8f285 Mon Sep 17 00:00:00 2001 From: Sven Fischer Date: Tue, 2 May 2017 19:48:28 +0200 Subject: [PATCH 3/3] Docker: review refacorting for export directory preparation --- scripts/docker-entrypoint.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/scripts/docker-entrypoint.sh b/scripts/docker-entrypoint.sh index d3894fb78..09c4168f8 100644 --- a/scripts/docker-entrypoint.sh +++ b/scripts/docker-entrypoint.sh @@ -16,20 +16,21 @@ map_uidgid() { set_permissions() { # Set permissions for consumption and export directory - for i in PAPERLESS_CONSUMPTION_DIR PAPERLESS_EXPORT_DIR; do - cur_dir_name=$(sed -e's/PAPERLESS_//; s/_DIR//' <<< $i | tr '[:upper:]' '[:lower:]') - chgrp paperless "${!i}" || { + for dir in PAPERLESS_CONSUMPTION_DIR PAPERLESS_EXPORT_DIR; do + # Extract the name of the current directory from $dir for the error message + cur_dir_name=$(echo "$dir" | awk -F'_' '{ print tolower($2); }') + chgrp paperless "${!dir}" || { echo "Changing group of ${cur_dir_name} directory:" - echo " ${!i}" + echo " ${!dir}" echo "failed." echo "" echo "Either try to set it on your host-mounted directory" echo "directly, or make sure that the directory has \`o+x\`" echo "permissions and the files in it at least \`o+r\`." } >&2 - chmod g+x "${!i}" || { + chmod g+x "${!dir}" || { echo "Changing group permissions of ${cur_dir_name} directory:" - echo " ${!i}" + echo " ${!dir}" echo "failed." echo "" echo "Either try to set it on your host-mounted directory"