From 67a893506b4b213c6b2fe14629b21f65c2541c1f Mon Sep 17 00:00:00 2001 From: sylvain Date: Wed, 14 May 2025 19:51:39 +0000 Subject: [PATCH] Actualiser dockerfile --- dockerfile | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dockerfile b/dockerfile index 56c024b..573e7f1 100644 --- a/dockerfile +++ b/dockerfile @@ -20,7 +20,7 @@ RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* # Générer un certificat SSL auto-signé RUN mkdir -p /etc/ssl/private && mkdir -p /etc/ssl/certs && \ openssl req -x509 -nodes -subj "/C=FR/ST=France/L=Paris/O=organization/OU=Org/CN=${DOMAIN}" \ - -newkey rsa:4096 -keyout /etc/ssl/private/${DOMAIN}.key -out /etc/ssl/certs/${DOMAIN}.crt -days 365 + -newkey rsa:4096 -keyout /etc/ssl/private/${DOMAIN}.key -out /etc/ssl/certs/${DOMAIN}.crt -days 365 # Copier et activer la config Apache COPY src/container_apache.conf /etc/apache2/sites-available/${DOMAIN}.conf @@ -29,8 +29,12 @@ RUN sed -i "s/{{DOMAIN}}/${DOMAIN}/g" /etc/apache2/sites-available/${DOMAIN}.con # Installer Hubzilla WORKDIR /var/www/html -RUN git clone https://framagit.org/hubzilla/core.git . && \ - util/add_addon_repo https://framagit.org/hubzilla/addons.git official && \ +RUN rm -rf /var/www/html/* && \ + git clone https://framagit.org/hubzilla/core.git . && \ + util/add_addon_repo https://framagit.org/hubzilla/addons.git official && \ + mkdir -p /var/www/html/store/[data]/smarty3 && \ + chown -R www-data:www-data /var/www/html/ + mkdir -p /var/www/html/store/[data]/smarty3 && chown -R www-data:www-data /var/www/html/ @@ -38,7 +42,7 @@ mkdir -p /var/www/html/store/[data]/smarty3 && chown -R www-data:www-data /var/w COPY src/msmtprc /etc/msmtprc RUN sed -i "s/{{SMTP_EMAIL}}/${SMTP_EMAIL}/g" /etc/msmtprc && sed -i "s/{{SMTP_SERVER}}/${SMTP_SERVER}/g" /etc/msmtprc && \ sed -i "s/{{SMTP_PORT}}/${SMTP_PORT}/g" /etc/msmtprc && sed -i "s/{{SMTP_USER}}/${SMTP_USER}/g" /etc/msmtprc && \ - sed -i "s/{{SMTP_PASS}}/${SMTP_PASS}/g" /etc/msmtprc + sed -i "s/{{SMTP_PASS}}/${SMTP_PASS}/g" /etc/msmtprc RUN chmod 600 /etc/msmtprc && chown www-data:www-data /etc/msmtprc RUN echo "sendmail_path = /usr/bin/msmtp -t" >> /etc/php/8.2/apache2/php.ini @@ -47,8 +51,8 @@ RUN echo "sendmail_path = /usr/bin/msmtp -t" >> /etc/php/8.2/apache2/php.ini COPY src/.htconfig.php /var/www/html/.htconfig.php RUN LOCATION_HASH=$(cat /dev/urandom | tr -dc 'a-f0-9' | fold -w 64 | head -n 1) && \ sed -i "s/{{DOMAIN}}/${DOMAIN}/g" /var/www/html/.htconfig.php && \ - sed -i "s/{{LOCATION_HASH}}/${LOCATION_HASH}/g" /var/www/html/.htconfig.php && \ - sed -i "s/{{ADMIN_EMAIL}}/${ADMIN_EMAIL}/g" /var/www/html/.htconfig.php + sed -i "s/{{LOCATION_HASH}}/${LOCATION_HASH}/g" /var/www/html/.htconfig.php && \ + sed -i "s/{{ADMIN_EMAIL}}/${ADMIN_EMAIL}/g" /var/www/html/.htconfig.php # Cron RUN echo "*/15 * * * * cd /var/www/html; /usr/bin/php Zotlabs/Daemon/Master.php Cron" | crontab -u www-data -