dockerfile changes

.dev/docker/entrypoint.sh

@@ -1,24 +1,39 @@
 #!/bin/ash
+## Ensure we are in /app
+
 cd /app
 
-tini -- php-fpm
+## check for .env file and generate app keys if missing
+if [ -f /app/var/.env ]; then
+  echo "external vars exist"
+  rm /app/.env
+  ln -s /app/var/.env /app/
+else
+  echo "external vars don't exist"
+  php artisan key:generate --force
+  cp /app/.env /app/var/
+fi
 
+## check for DB up before starting the panel
+echo "Checking database status."
 until nc -z -v -w30 $DB_HOST 3306
+
 do
   echo "Waiting for database connection..."
   # wait for 5 seconds before check again
   sleep 5
 done
 
-if [ "$(cat .env)" == "" ]; then
-  cat /app/.env.example > /app/.env
-fi
-
-if [ "$(cat .env | grep APP_KEY)" == "APP_KEY=" ]; then
-  echo "Generating New Key"
-  php artisan key:generate --force
-fi
-
+## make sure the db is set up
 php artisan migrate --seed --force
-echo "Done"
-nginx -g 'pid /tmp/nginx.pid; daemon off;'
+
+echo -e "Done\n"
+
+## start php-fpm in the background
+echo -e "Starting php-fpm in the background. \n"
+php-fpm7 -D
+echo -e "php-fpm starte.d \n"
+
+## start webserver
+echo -e "Starting nginx in the foreground. \n"
+nginx -g 'pid /tmp/nginx.pid; daemon off;'