Merge pull request #283 from dbarzin/dev

reverse changes

Author: dbarzin

Dockerfile

@@ -1,55 +1,49 @@
-FROM php:8.2-fpm
-
-# Installer les extensions PHP nécessaires
-RUN apt-get update && apt-get install -y \
-    git \
+FROM --platform=amd64 nginx:bookworm
+
+RUN apt update && apt dist-upgrade -y
+RUN apt-get install -y --no-install-recommends \
+    git=1:2.39.5-* \
+    composer=2.5.5-* \
+    php=2:8.2* \
+    php-cli=2:8.2* \
+    php-opcache \
+    php-mysql=2:8.2* \
+    php-pgsql=2:8.2* \
+    php-zip=2:8.2* \
+    php-gd=2:8.2* \
+    php-mbstring=2:8.2* \
+    php-curl=2:8.2* \
+    php-xml=2:8.2* \
+    mariadb-server \
     cron \
-    nginx \
-    php-mysql \
-    php-pgsql \
-    php-zip \
-    php-gd \
-    php-mbstring \
-    php-curl \
-    php-xml \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
-# Installer Composer
-COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
+RUN touch /etc/mailname
+RUN echo "sender@yourdomain.org" > /etc/mailname
+RUN echo "* * * * * root cd /var/www/deming && php artisan schedule:run >> /dev/null 2>&1" >> /etc/crontab
+RUN useradd -ms /bin/bash deming
+RUN mkdir -p /var/www/deming
 
-# Définir le répertoire de travail
 WORKDIR /var/www/deming
 
-# Cloner le dépôt Git
 RUN git clone https://www.github.com/dbarzin/deming .
-
-# Copier les fichiers de configuration
-COPY docker/deming.conf /etc/nginx/conf.d/default.conf
-COPY docker/userdemo.sh /etc/userdemo.sh
+RUN cp docker/deming.conf /etc/nginx/conf.d/default.conf
+RUN cp docker/userdemo.sh /etc/userdemo.sh
 COPY docker/resetdb.sh /etc/resetdb.sh
-COPY docker/uploadiso27001db.sh /etc/uploadiso27001db.sh
+RUN cp docker/uploadiso27001db.sh /etc/uploadiso27001db.sh
 COPY docker/initialdb.sh /etc/initialdb.sh
-COPY docker/entrypoint.sh /opt/entrypoint.sh
-
-# Rendre les scripts exécutables
-RUN chmod +x /etc/*.sh /opt/entrypoint.sh
-
-# Configurer les permissions
-RUN mkdir -p storage/framework/views storage/framework/cache storage/framework/sessions bootstrap/cache
-RUN chmod -R 775 storage bootstrap/cache
-RUN chown -R www-data:www-data storage bootstrap/cache
-
-# Installer les dépendances PHP
+RUN chmod +x /etc/*.sh
+RUN mkdir -p storage/framework/views && mkdir -p storage/framework/cache && mkdir -p storage/framework/sessions && mkdir -p bootstrap/cache
+RUN chmod -R 775 /var/www/deming/storage && chown -R www-data:www-data /var/www/deming
 RUN composer install
 RUN php artisan vendor:publish --all
 
-# Configurer le fichier .env
 RUN cp .env.example .env
 RUN sed -i 's/DB_HOST=127\.0\.0\.1/DB_HOST=mysql/' .env
 
-# Exposer le port 80
+COPY docker/entrypoint.sh /opt/entrypoint.sh
+RUN chmod u+x /opt/entrypoint.sh
+
 EXPOSE 80
 
-# Démarrer Nginx et PHP-FPM
-ENTRYPOINT ["/opt/entrypoint.sh"]
-CMD ["nginx", "-g", "daemon off;"]
+ENTRYPOINT "/opt/entrypoint.sh"

docker/docker-compose.yml

@@ -1,40 +1,33 @@
 version: "3.7"
 services:
   web:
-    image: deming
-    depends_on:
-        mysql:
-            condition: service_healthy
     build:
-        context: .
-        dockerfile: Dockerfile
+      context: .
+      dockerfile: Dockerfile_web
     environment:
-        DB_HOST: mysql
-        DB_DATABASE: 'deming'
-        DB_USER: 'deming_user'
-        DB_PASSWORD: 'demPasssword-123'
-        DB_ROOT_PASSWORD: 'root'
-        ### PLEASE DISABLE AFTER THE FIRST RUN FOR OPTIMIZATION PRODUCTION
-        DB_SLEEP=10
-        ### PLEASE DISABLE FOR PRODUCTION
-        USE_DEMO_DATA=1
-        ### PLEASE DISABLE FOR PRODUCTION
-        RESET_DB=FR #EN OR FR
-        ### PLEASE AFTER ONE RUN DISABLE FOR OPTIMIZATION
-        UPLOAD_DB_ISO27001=FR #EN OR FR
-        ### PLEASE AFTER ONE RUN DISABLE FOR OPTIMIZATION
-        INITIAL_DB=FR #EN OR FR
-        TZ=Europe/Paris
+      ### PLEASE DISABLE AFTER THE FIRST RUN FOR OPTIMIZATION PRODUCTION
+      - DB_SLEEP=10
+      ### PLEASE DISABLE FOR PRODUCTION
+      - USE_DEMO_DATA=1
+      ### PLEASE DISABLE FOR PRODUCTION
+      #- RESET_DB=FR #EN OR FR
+      ### PLEASE AFTER ONE RUN DISABLE FOR OPTIMIZATION
+      - UPLOAD_DB_ISO27001=FR #EN OR FR
+      ### PLEASE AFTER ONE RUN DISABLE FOR OPTIMIZATION
+      - INITIAL_DB=FR #EN OR FR
+      - TZ=Europe/Paris
     volumes:
-        - ./custom/.env:/var/www/deming/.env
-        - ./custom/custom_postfix_main.cf:/etc/postfix/main.cf
-        - ./custom/custom_postfix_mailname:/etc/mailname
-        - ./custom/deming.php:/var/www/deming/config/deming.php
-        - ./custom/Kernel.php:/var/www/deming/app/Console/Kernel.php
-        - ./custom/app.php:/var/www/deming/config/app.php
+      - ./custom/.env:/var/www/deming/.env
+      - ./custom/custom_postfix_main.cf:/etc/postfix/main.cf
+      - ./custom/custom_postfix_mailname:/etc/mailname
+      - ./custom/deming.php:/var/www/deming/config/deming.php
+      - ./custom/Kernel.php:/var/www/deming/app/Console/Kernel.php
+      - ./custom/app.php:/var/www/deming/config/app.php
     ports:
-        - 8000:80
-
+      - 80:80
+    depends_on:
+      mysql:
+        condition: service_healthy
   mysql:
     image: mysql:8
     environment:
@@ -43,12 +36,12 @@ services:
       MYSQL_PASSWORD: 'demPasssword-123'
       MYSQL_ROOT_PASSWORD: 'root'
     expose:
-        - 3306
+      - 3306
     healthcheck:
-        test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u", "root", "-p$${MYSQL_ROOT_PASSWORD}"]
-        interval: 10s
-        timeout: 5s
-        retries: 3
+      test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u", "root", "-p$${MYSQL_ROOT_PASSWORD}"]
+      interval: 10s
+      timeout: 5s
+      retries: 3
 ### PLEASE ENABLE FOR PERSISTENT DATABASE DATA
     volumes:
       - dbdata:/var/lib/mysql