diff --git a/dockerfile b/dockerfile index 6569fa2..71560ec 100644 --- a/dockerfile +++ b/dockerfile @@ -2,65 +2,52 @@ FROM debian:12 ENV DEBIAN_FRONTEND=noninteractive -ARG DOMAIN -ARG SMTP_EMAIL -ARG SMTP_SERVER -ARG SMTP_PORT -ARG SMTP_USER -ARG SMTP_PASS -ARG ADMIN_EMAIL - -# Installer les paquets nécessaires +# Installation des dépendances nécessaires RUN apt-get update && apt-get install -y \ apache2 \ - php php-cli php-mysql php-curl php-fpm php-gd php-json php-xml php-zip php-mbstring php-bcmath php-gmp php-intl \ - software-properties-common git msmtp mariadb-client cron curl unzip nano + mariadb-client \ + php \ + php-cli \ + php-mysql \ + php-curl \ + php-gd \ + php-json \ + php-xml \ + php-zip \ + php-mbstring \ + php-bcmath \ + php-gmp \ + php-intl \ + git \ + curl \ + unzip \ + nano \ + cron \ + && apt-get clean && rm -rf /var/lib/apt/lists/* -# Nettoyer -RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* +# Configuration du répertoire de travail +WORKDIR /var/www/html -# Copier et activer la config Apache (HTTP uniquement) -COPY src/container_apache.conf /etc/apache2/sites-available/${DOMAIN}.conf -RUN sed -i "s/{{DOMAIN}}/${DOMAIN}/g" /etc/apache2/sites-available/${DOMAIN}.conf && \ - a2dissite 000-default.conf && \ - a2ensite ${DOMAIN}.conf && \ - a2enmod rewrite - -# Installer Hubzilla -RUN git clone https://framagit.org/hubzilla/core.git /var/www/html && \ - /bin/bash -c "cd /var/www/html && ./util/add_addon_repo https://framagit.org/hubzilla/addons.git official" && \ - mkdir -p /var/www/html/store/[data]/smarty3 && \ +# Clonage du dépôt Hubzilla +RUN rm -r /var/www/html/ +RUN git clone https://framagit.org/hubzilla/core.git . && \ + mkdir -p store/[data]/smarty3 && \ chown -R www-data:www-data /var/www/html +# Activation des modules Apache nécessaires +RUN a2enmod rewrite ssl -# Configurer msmtp -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 && \ - chmod 600 /etc/msmtprc && \ - chown www-data:www-data /etc/msmtprc - -# Activer msmtp dans PHP -RUN echo "sendmail_path = /usr/bin/msmtp -t" >> /etc/php/8.2/apache2/php.ini - -# Config PHP (upload size + register_argc_argv) +# Configuration de PHP RUN echo "upload_max_filesize = 20M" >> /etc/php/8.2/apache2/php.ini && \ echo "post_max_size = 20M" >> /etc/php/8.2/apache2/php.ini && \ echo "register_argc_argv = On" >> /etc/php/8.2/apache2/php.ini -# Fichier .htconfig.php (préconfiguré) -COPY src/.htconfig.php /tmp/.htconfig.php -RUN LOCATION_HASH=$(cat /dev/urandom | tr -dc 'a-f0-9' | fold -w 64 | head -n 1) && \ - sed "s/{{DOMAIN}}/${DOMAIN}/g; s/{{LOCATION_HASH}}/${LOCATION_HASH}/g; s/{{ADMIN_EMAIL}}/${ADMIN_EMAIL}/g" /tmp/.htconfig.php > /var/www/html/.htconfig.php && \ - chown www-data:www-data /var/www/html/.htconfig.php +# Configuration du site Apache +COPY src/hubzilla.conf /etc/apache2/sites-available/hubzilla.conf +RUN a2dissite 000-default.conf && a2ensite hubzilla.conf -# Cron -RUN echo "*/15 * * * * cd /var/www/html; /usr/bin/php Zotlabs/Daemon/Master.php Cron" | crontab -u www-data - - -# Script de démarrage +# Copie du script de démarrage COPY src/start.sh /start.sh RUN chmod +x /start.sh + CMD ["/bin/bash", "/start.sh"] diff --git a/src/container_apache.conf b/src/container_apache.conf index 42318e2..a3e3ed3 100644 --- a/src/container_apache.conf +++ b/src/container_apache.conf @@ -1,5 +1,5 @@ - ServerName {{DOMAIN}} + ServerName yourdomain.com DocumentRoot /var/www/html @@ -7,6 +7,6 @@ Require all granted - ErrorLog ${APACHE_LOG_DIR}/hubzilla_error.log - CustomLog ${APACHE_LOG_DIR}/hubzilla_access.log combined + ErrorLog ${APACHE_LOG_DIR}/error.log + CustomLog ${APACHE_LOG_DIR}/access.log combined \ No newline at end of file diff --git a/src/hubzilla.conf b/src/hubzilla.conf new file mode 100644 index 0000000..f22afa5 --- /dev/null +++ b/src/hubzilla.conf @@ -0,0 +1,12 @@ + + ServerName yourdomain.com + DocumentRoot /var/www/html + + + AllowOverride All + Require all granted + + + ErrorLog ${APACHE_LOG_DIR}/error.log + CustomLog ${APACHE_LOG_DIR}/access.log combined + diff --git a/src/start.sh b/src/start.sh index e3c8b18..98cd5ec 100755 --- a/src/start.sh +++ b/src/start.sh @@ -1,7 +1,7 @@ #!/bin/bash -echo "[INFO] Lancement du service cron..." -service cron start +# Démarrage du service Apache +service apache2 start -echo "[INFO] Lancement du serveur Apache..." -apachectl -D FOREGROUND +# Attente indéfinie pour maintenir le conteneur en cours d'exécution +tail -f /dev/null \ No newline at end of file