From d66b9575bf6e17c0bd7bcb831583d60a250e9901 Mon Sep 17 00:00:00 2001
From: Didier <dbarzin@gmail.com>
Date: Mon, 22 Jan 2024 08:38:35 +0100
Subject: [PATCH] fix docker

---
 docker/docker-compose.yml.tmpl | 30 ------------------------------
 docker/entrypoint.sh           | 15 ---------------
 2 files changed, 45 deletions(-)

diff --git a/docker/docker-compose.yml.tmpl b/docker/docker-compose.yml.tmpl
index 4fd32525..8d0122c8 100644
--- a/docker/docker-compose.yml.tmpl
+++ b/docker/docker-compose.yml.tmpl
@@ -10,8 +10,6 @@ services:
       # SMTP conf
       - ./ssmtp.conf:/etc/ssmtp/ssmtp.conf
       # Mercator entry point
-      - ./entrypoint.sh:/var/www/mercator/docker/entrypoint.sh:ro
-      # ne peut pas être read-only (commande php artisan key:generate le modifie)
       - ./.env:/var/www/mercator/.env
       # map la database sqlite sur le disque de l'hôte
       - ./data/sql/:/var/www/mercator/sql/
@@ -22,34 +20,6 @@ services:
       - 8000:80
     networks:
       - local
-  # Non fonctionnel pour le moment la database utilisé par défaut est interne au conteneur APP
-  #db:
-  #  image: mysql:5.7
-  #  restart: unless-stopped
-  #  environment:
-  #    MYSQL_DATABASE: ${DB_DATABASE}
-  #    MYSQL_USER: ${DB_USERNAME}
-  #    MYSQL_PASSWORD: ${DB_PASSWORD}
-  #    MYSQL_ROOT_PASSWORD: ${DB_PASSWORD}
-  #    # MYSQL_ALLOW_EMPTY_PASSWORD: "true"
-  #  volumes:
-  #    - db:/var/lib/mysql
-  #    - ./data/backup:/backup
-  #    - ./bin/mysql:/app/
-  #  networks:
-  #    - local
-
-#   nginx:
-#     image: nginx:alpine
-#     container_name: travellist-nginx
-#     restart: unless-stopped
-#     ports:
-#       - 8000:80
-#     volumes:
-#       - ./:/var/www
-#       - ./docker-compose/nginx:/etc/nginx/conf.d/
-#     networks:
-#       - local
 
 networks:
   local:
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 3f9065b8..80b2866e 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -15,20 +15,5 @@ cd /var/www/mercator
 
 _wait_for_db_ready
 
-# initialisation de la base de données si elle n'existe pas
-if [ ! -s ./sql/db.sqlite ]
-then
-    php artisan --no-interaction migrate --seed
-
-    # génération des clés
-    php artisan key:generate
-
-    # vider le cache
-    php artisan config:clear
-
-    # configurer Passport for Mercator API : https://dbarzin.github.io/mercator/api/
-    php artisan passport:install
-fi
-
 # start application
 php artisan serve --host=0.0.0.0