From c119d8d1cd65ee74b529c4a654131bff7c689df2 Mon Sep 17 00:00:00 2001 From: xgaia Date: Fri, 21 Apr 2023 12:32:35 +0200 Subject: [PATCH] chore(docker): fix dockerbuild permission issue --- Dockerfile | 8 ++------ README.md | 2 +- entrypoint.sh | 6 ------ 3 files changed, 3 insertions(+), 13 deletions(-) mode change 100644 => 100755 entrypoint.sh diff --git a/Dockerfile b/Dockerfile index d126284..c617dcb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ENV SERVERNAME=localhost ENV UPLOAD_MAX_FILESIZE=24M ENV POST_MAX_SIZE=24M ENV MAX_FILE_UPLOADS=201 -ENV PDF_STORAGE_PATH= +ENV PDF_STORAGE_PATH=/data ENV DISABLE_ORGANIZATION=false ENV PDF_DEMO_LINK=true @@ -14,15 +14,11 @@ RUN apt update && \ COPY . /usr/local/signaturepdf -RUN chown -R www-data:www-data /usr/local/signaturepdf && chmod 750 -R /usr/local/signaturepdf && \ - chmod 775 -R /usr/local/signaturepdf/entrypoint.sh && \ - envsubst < /usr/local/signaturepdf/config/php.ini > /usr/local/etc/php/conf.d/uploads.ini && \ +RUN envsubst < /usr/local/signaturepdf/config/php.ini > /usr/local/etc/php/conf.d/uploads.ini && \ envsubst < /usr/local/signaturepdf/config/apache.conf > /etc/apache2/sites-available/signaturepdf.conf && \ envsubst < /usr/local/signaturepdf/config/config.ini.tpl > /usr/local/signaturepdf/config/config.ini && \ a2enmod rewrite && a2ensite signaturepdf WORKDIR /usr/local/signaturepdf -USER www-data - CMD /usr/local/signaturepdf/entrypoint.sh diff --git a/README.md b/README.md index 0281779..ecc154d 100644 --- a/README.md +++ b/README.md @@ -95,9 +95,9 @@ Les variables suivantes permettent de configurer le déployement : |`UPLOAD_MAX_FILESIZE`|Taille maximum du fichier PDF à signer|48M|24M| |`POST_MAX_SIZE`|Taille maximum du fichier PDF à signer|48M|24M| |`MAX_FILE_UPLOADS`|Nombre de pages maximum du PDF, ici 200 pages + le PDF d'origine|401|201| -|`PDF_STORAGE_PATH`|chemin vers lequel les fichiers pdf uploadés pourront être stockés|/data|| |`DISABLE_ORGANIZATION`|Desactiver la route Organiser|true|false| |`PDF_DEMO_LINK`|Afficher, retirer ou changer le lien de PDF de démo|false, `link` or `relative path`|true| +| `PDF_STORAGE_PATH` | chemin vers lequel les fichiers pdf uploadés pourront être stockés | /data | /data | ```bash docker run -d --name=signaturepdf -p 8080:80 -e SERVERNAME=pdf.example.org -e UPLOAD_MAX_FILESIZE=48M -e POST_MAX_SIZE=48M -e MAX_FILE_UPLOADS=401 -e PDF_STORAGE_PATH=/data signaturepdf diff --git a/entrypoint.sh b/entrypoint.sh old mode 100644 new mode 100755 index 2449535..d5fe986 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,17 +1,11 @@ #! /bin/bash envsubst < /usr/local/signaturepdf/config/apache.conf > /etc/apache2/sites-available/signaturepdf.conf - envsubst < /usr/local/signaturepdf/config/php.ini > /usr/local/etc/php/conf.d/uploads.ini - envsubst < /usr/local/signaturepdf/config/config.ini.tpl > /usr/local/signaturepdf/config/config.ini -chown -R www-data:www-data /usr/local/signaturepdf && chmod 750 -R /usr/local/signaturepdf - if [[ ! -z $PDF_STORAGE_PATH ]] ; then mkdir -p $PDF_STORAGE_PATH - chown -R www-data:www-data $PDF_STORAGE_PATH - chmod 750 -R $PDF_STORAGE_PATH fi apache2-foreground