From 2f203927cc65c6cb8bc0d3448551df7e048963fa Mon Sep 17 00:00:00 2001
From: Didier <dbarzin@gmail.com>
Date: Fri, 26 Jan 2024 16:55:59 +0100
Subject: [PATCH] work on docker

---
 Dockerfile              | 10 +++++-----
 docker/supervisord.conf |  5 ++---
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 05774414..b1569696 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -54,18 +54,18 @@ RUN chown -R mercator:www /var/www/mercator
 # Now work with Mercator user
 USER mercator:www
 
-# Set environment variables
-cp .env.sqlite .env
-
 # Run composer
 RUN composer -n update
 
 # Publish Laravel Vendor resources
-# RUN php artisan vendor:publish --all
+RUN php artisan vendor:publish --all
 
 # Create database folder
 RUN mkdir sql
 
-EXPOSE 8000
+# copy environement varaibles file
+cp .env.sqlite .env
 
+# Start surpervisord
+EXPOSE 8000
 CMD ["/usr/bin/supervisord", "-c", "/etc/supervisord.conf"]
diff --git a/docker/supervisord.conf b/docker/supervisord.conf
index 008f7de9..659141bf 100644
--- a/docker/supervisord.conf
+++ b/docker/supervisord.conf
@@ -3,12 +3,11 @@ nodaemon=true
 
 [program:migrate]
 command=/bin/sh -c '
-    cd /var/www/mercator;
     if [ ! -s ${DB_DATABASE} ];
     then
-        php artisan migrate --seed --force --path=database/migrations;
+        php artisan migrate --seed --force;
     else
-        php artisan migrate --force --path=database/migrations;
+        php artisan migrate --force;
     fi;
     touch /tmp/migrated'
 autorestart=false