Merge branch 'develop' into feature/32-add-max-execution-time-environment-variable

Author: pehbehbeh

Dockerfile

@@ -1,4 +1,4 @@
-FROM php:7.4.8-fpm-alpine3.11
+FROM php:7.4.9-fpm-alpine3.11
 
 ENV PHP_OPCACHE_VALIDATE_TIMESTAMPS="0" \
     PHP_OPCACHE_MAX_ACCELERATED_FILES="10000" \
@@ -10,8 +10,6 @@ ENV PHP_OPCACHE_VALIDATE_TIMESTAMPS="0" \
 RUN apk info \
     && echo @edge http://nl.alpinelinux.org/alpine/edge/community >> /etc/apk/repositories \
     && echo @edge http://nl.alpinelinux.org/alpine/edge/main >> /etc/apk/repositories \
-    && echo @3.9 http://dl-cdn.alpinelinux.org/alpine/v3.9/main >> /etc/apk/repositories \
-    && echo @3.10 http://dl-cdn.alpinelinux.org/alpine/v3.10/main >> /etc/apk/repositories \
     && apk update \
     && apk upgrade \
     && apk add --no-cache --virtual .build-deps \
@@ -38,9 +36,6 @@ RUN apk info \
         php7-dom \
         mysql-client \
         yarn@edge \
-        xvfb \
-        chromium@3.9 \
-        chromium-chromedriver@3.9 \
     && docker-php-ext-configure gd --with-freetype --with-jpeg \
     && docker-php-ext-install -j$(nproc) \
         gd \
@@ -101,10 +96,9 @@ RUN yarn config set strict-ssl false && \
 
 # copy root folder and make run scripts executable
 COPY ./root/ /root/
-RUN find /root -name "run-*.sh" -exec chmod -v +x {} \;
-RUN chmod +x /root/entrypoint.sh
+RUN find /root -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,12 +45,14 @@ version: '3.7'
 services:
   app:
     build: .
-    command: /root/run-dev.sh
     restart: unless-stopped
     environment:
       - PHP_OPCACHE_VALIDATE_TIMESTAMPS=1
       - PHP_MEMORY_LIMIT=1G
       - PHP_MAX_EXECUTION_TIME=30
+      - STARTUP_COMMAND1=/root/modules/dev.sh
+      - STARTUP_COMMAND2=php artisan migrate --force
+      - STARTUP_COMMAND3=php artisan setup
     volumes:
       - ./:/opt/app:cached
     ports:
@@ -81,14 +83,15 @@ 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
       - PHP_MAX_EXECUTION_TIME=30
-      - 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:

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 "$@"

root/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

root/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

root/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"