merge run-dev and run-prod, fixed wait-for-it

Author: Hauke Ingwersen

Dockerfile

@@ -103,7 +103,13 @@ COPY ./root/ /root/
 RUN find /root -name "run-*.sh" -exec chmod -v +x {} \;
 RUN chmod +x /root/entrypoint.sh
 
+# copy startup modules folder and make scripts executalbe
+
+COPY ./modules/ /root/modules/
+RUN find /root/modules/ -name "*.sh" -exec chmod -v +x {} \;
+
+
 # run the application
 ENTRYPOINT ["/root/entrypoint.sh"]
-CMD /root/run-prod.sh
+CMD ["runsvdir", "/etc/service"]
 EXPOSE 8080

README.md

@@ -45,11 +45,13 @@ version: '3.7'
 services:
   app:
     build: .
-    command: /root/run-dev.sh
     restart: unless-stopped
     environment:
       - PHP_OPCACHE_VALIDATE_TIMESTAMPS=1
       - PHP_MEMORY_LIMIT=1G
+      - STARTUP_COMMAND1=/root/modules/dev.sh
+      - STARTUP_COMMAND2=php artisan migrate --force
+      - STARTUP_COMMAND3=php artisan setup
     volumes:
       - ./:/opt/app:cached
     ports:
@@ -80,13 +82,14 @@ version: '3.7'
 services:
   app:
     image: sourceboat/docker-laravel
-    command: /root/run-prod.sh
     restart: unless-stopped
     environment:
       - PHP_OPCACHE_VALIDATE_TIMESTAMPS=1
       - PHP_MEMORY_LIMIT=1G
-      - STARTUP_COMMAND1=php artisan migrate --force
-      - STARTUP_COMMAND2=php artisan horizon:restart
+      - STARTUP_COMMAND1=/root/modules/storage.sh
+      - STARTUP_COMMAND2=/root/modules/cache.sh
+      - STARTUP_COMMAND3=php artisan migrate --force
+      - STARTUP_COMMAND4=php artisan horizon:restart
     volumes:
       - ./:/opt/app:cached
     ports:

modules/cache.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+cd /opt/app
+
+# build caches
+echo "Build caches..."
+php artisan config:cache
+php artisan route:cache
+php artisan view:cache

modules/dev.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+cd /opt/app
+
+echo "Build development..."
+composer install --prefer-dist --no-progress --no-interaction
+yarn

modules/storage.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+cd /opt/app
+
+echo "Create storage symlink..."
+su www-data -s /bin/sh -c "php artisan storage:link -q"

root/entrypoint.sh

@@ -10,13 +10,12 @@ touch /opt/app/storage/logs/worker.log
 chown www-data:www-data -R /opt/app/storage
 chown www-data:www-data -R /opt/app/bootstrap/cache
 
-cd /opt/app
-
-# create storage symlink
-echo "create storage symlink..."
-su www-data -s /bin/sh -c "php artisan storage:link -q"
-
 # startup commands
+echo "Running startup commands..."
 php /usr/local/bin/startup-commands.php | bash
 
+if [[ -n "$DB_HOST" || -n "$DB_PORT" ]]; then
+  wait-for-it.sh --host=$DB_HOST --port=$DB_PORT
+fi
+
 exec "$@"