From beb2313366a7d721076cc1d4ee49406c83061493 Mon Sep 17 00:00:00 2001 From: Vincent LAURENT Date: Fri, 1 Apr 2022 17:36:53 +0200 Subject: [PATCH] Docker configuration file in the config folder --- Dockerfile | 8 ++++---- apache.conf => config/apache.conf | 0 php.ini => config/php.ini | 0 3 files changed, 4 insertions(+), 4 deletions(-) rename apache.conf => config/apache.conf (100%) rename php.ini => config/php.ini (100%) diff --git a/Dockerfile b/Dockerfile index 7573bb4..5c380a1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,13 +10,13 @@ RUN apt update && apt install -y gettext-base librsvg2-bin pdftk imagemagick pot COPY . /usr/local/signaturepdf RUN chown -R www-data:www-data /usr/local/signaturepdf && chmod 750 -R /usr/local/signaturepdf && \ - envsubst < /usr/local/signaturepdf/php.ini > /usr/local/etc/php/conf.d/uploads.ini && \ - envsubst < /usr/local/signaturepdf/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/apache.conf > /etc/apache2/sites-available/signaturepdf.conf && \ a2enmod rewrite && a2ensite signaturepdf WORKDIR /usr/local/signaturepdf -CMD envsubst < /usr/local/signaturepdf/apache.conf > /etc/apache2/sites-available/signaturepdf.conf && \ - envsubst < /usr/local/signaturepdf/php.ini > /usr/local/etc/php/conf.d/uploads.ini && \ +CMD 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 && \ chown -R www-data:www-data /usr/local/signaturepdf && chmod 750 -R /usr/local/signaturepdf && \ apache2-foreground diff --git a/apache.conf b/config/apache.conf similarity index 100% rename from apache.conf rename to config/apache.conf diff --git a/php.ini b/config/php.ini similarity index 100% rename from php.ini rename to config/php.ini