Merge pull request #282 from dbarzin/dev

Dev

Author: dbarzin

Dockerfile

@@ -1,48 +1,55 @@
-FROM nginx:bookworm
+FROM php:8.2-fpm
 
-RUN apt update && apt dist-upgrade -y
-RUN apt-get install -y --no-install-recommends \
+# Installer les extensions PHP nécessaires
+RUN apt-get update && apt-get install -y \
     git \
-    composer \
-    php \
-    php-cli \
-    php-opcache \
+    cron \
+    nginx \
     php-mysql \
     php-pgsql \
     php-zip \
     php-gd \
     php-mbstring \
     php-curl \
     php-xml \
-    cron \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
-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
+# Installer Composer
+COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
 
+# 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 .
-RUN cp docker/deming.conf /etc/nginx/conf.d/default.conf
-RUN cp docker/userdemo.sh /etc/userdemo.sh
+
+# Copier les fichiers de configuration
+COPY docker/deming.conf /etc/nginx/conf.d/default.conf
+COPY docker/userdemo.sh /etc/userdemo.sh
 COPY docker/resetdb.sh /etc/resetdb.sh
-RUN cp docker/uploadiso27001db.sh /etc/uploadiso27001db.sh
+COPY docker/uploadiso27001db.sh /etc/uploadiso27001db.sh
 COPY docker/initialdb.sh /etc/initialdb.sh
-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
+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 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
 
-COPY docker/entrypoint.sh /opt/entrypoint.sh
-RUN chmod u+x /opt/entrypoint.sh
-
+# Exposer le port 80
 EXPOSE 80
 
+# Démarrer Nginx et PHP-FPM
 ENTRYPOINT ["/opt/entrypoint.sh"]
+CMD ["nginx", "-g", "daemon off;"]

docker/docker-compose.yml

@@ -4,10 +4,10 @@ services:
     image: deming
     depends_on:
         mysql:
-            condition: service_healthy    
+            condition: service_healthy
     build:
         context: .
-        dockerfile: Dockerfile_web
+        dockerfile: Dockerfile
     environment:
         DB_HOST: mysql
         DB_DATABASE: 'deming'
@@ -43,12 +43,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