Merge branch 'release/0.8.0'

Author: pehbehbeh

Dockerfile

@@ -1,4 +1,4 @@
-FROM php:7.4.2-fpm-alpine3.11
+FROM php:7.4.4-fpm-alpine3.11
 
 ENV PHP_OPCACHE_VALIDATE_TIMESTAMPS="0" \
     PHP_OPCACHE_MAX_ACCELERATED_FILES="10000" \
@@ -106,5 +106,5 @@ COPY ./root/.bashrc /root/
 RUN find /home/app -name "run-*.sh" -exec chmod -v +x {} \;
 
 # run the application
-CMD /home/app/run-dev.sh
+CMD /home/app/run-prod.sh
 EXPOSE 8080

README.md

@@ -45,6 +45,7 @@ version: '3.7'
 services:
   app:
     build: .
+    command: /home/app/run-dev.sh
     restart: unless-stopped
     environment:
       - PHP_OPCACHE_VALIDATE_TIMESTAMPS=1

etc/nginx/nginx.conf

@@ -1,8 +1,8 @@
 user  nginx;
 worker_processes  4;
 
-error_log  /var/log/nginx/error.log warn;
-pid        /var/run/nginx.pid;
+error_log /dev/stdout error.log warn;
+pid /var/run/nginx.pid;
 
 events {
     worker_connections  1024;
@@ -11,18 +11,18 @@ events {
 }
 
 http {
-    include       /etc/nginx/mime.types;
-    default_type  application/octet-stream;
+    include /etc/nginx/mime.types;
+    default_type application/octet-stream;
 
     log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
                       '$status $body_bytes_sent "$http_referer" '
                       '"$http_user_agent" "$http_x_forwarded_for"';
 
-    access_log  /var/log/nginx/access.log  main;
+    access_log /dev/stdout access.log  main;
 
-    sendfile        on;
+    sendfile on;
 
-    keepalive_timeout  65;
+    keepalive_timeout 65;
 
     include /etc/nginx/conf.d/*.conf;
 }

home/app/run-dev.sh

@@ -19,6 +19,7 @@ yarn
 # migrate and setup database
 wait-for-it.sh mysql:3306
 php artisan migrate --force
+php artisan setup
 
 # start the services
 exec runsvdir /etc/service

home/app/run-prod.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+echo "Running via PROD script..."
+cd /opt/app
+
+# make sure Laravel can write its own files
+mkdir -p /opt/app/storage/logs/
+touch /opt/app/storage/logs/laravel.log
+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
+
+# migrate and setup database
+wait-for-it.sh mysql:3306
+php artisan migrate --force
+php artisan setup
+
+# build caches
+php artisan config:cache
+php artisan route:cache
+php artisan view:cache
+
+# restart the Horizon supervisors
+php artisan horizon:restart
+
+# start the services
+exec runsvdir /etc/service