Merge branch 'release/0.11.0'

Author: pehbehbeh

Dockerfile

@@ -1,16 +1,15 @@
-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" \
     PHP_OPCACHE_MEMORY_CONSUMPTION="192" \
     PHP_OPCACHE_MAX_WASTED_PERCENTAGE="10" \
-    PHP_MEMORY_LIMIT="512M"
+    PHP_MEMORY_LIMIT="512M" \
+    PHP_MAX_EXECUTION_TIME="60"
 
 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 \
@@ -37,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 \
@@ -66,11 +62,6 @@ ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so php
 # change default shell
 SHELL ["/bin/bash", "-c"]
 
-# create app user
-RUN addgroup -S app && \
-    adduser -S app -G app && \
-    echo "app ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
-
 # create working dir
 RUN mkdir /opt/app
 WORKDIR /opt/app
@@ -103,13 +94,11 @@ RUN composer global require hirak/prestissimo
 RUN yarn config set strict-ssl false && \
     yarn global add cross-env
 
-# copy home folder and make run scripts executable
-COPY ./home/app/ /home/app/
-COPY ./root/.bashrc /root/
-RUN find /home/app -name "run-*.sh" -exec chmod -v +x {} \;
-RUN chmod +x /home/app/entrypoint.sh
+# copy root folder and make run scripts executable
+COPY ./root/ /root/
+RUN find /root -name "*.sh" -exec chmod -v +x {} \;
 
 # run the application
-ENTRYPOINT ["/home/app/entrypoint.sh"]
-CMD /home/app/run-prod.sh
+ENTRYPOINT ["/root/entrypoint.sh"]
+CMD ["runsvdir", "/etc/service"]
 EXPOSE 8080

README.md

@@ -45,11 +45,14 @@ version: '3.7'
 services:
   app:
     build: .
-    command: /home/app/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:
@@ -80,13 +83,15 @@ version: '3.7'
 services:
   app:
     image: sourceboat/docker-laravel
-    command: /home/app/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
+      - PHP_MAX_EXECUTION_TIME=30
+      - 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:

etc/nginx/conf.d/default.conf

@@ -29,5 +29,6 @@ server {
         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
         fastcgi_param PATH_INFO $fastcgi_path_info;
         fastcgi_param HTTPS $is_https;
+        fastcgi_hide_header X-Powered-By;
     }
 }

etc/nginx/nginx.conf

@@ -14,6 +14,8 @@ http {
     include /etc/nginx/mime.types;
     default_type application/octet-stream;
 
+    server_tokens off;
+
     log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
                       '$status $body_bytes_sent "$http_referer" '
                       '"$http_user_agent" "$http_x_forwarded_for"';

home/app/.bashrc

@@ -1 +1,17 @@
-source /home/app/.bashrc
+# useful aliases
+alias ll='ls -la'
+alias artisan="php artisan"
+
+# prompt colors and short user display
+force_color_prompt=yes
+PS1='\[\033[1;36m\]\u\[\033[1;31m\]\[\033[1;32m\]:\[\033[1;35m\]\w\[\033[1;31m\]\$\[\033[0m\] '
+
+# artisan autocompletion
+_artisan()
+{
+	COMP_WORDBREAKS=${COMP_WORDBREAKS//:}
+	COMMANDS=`artisan --raw --no-ansi list | sed "s/[[:space:]].*//g"`
+	COMPREPLY=(`compgen -W "$COMMANDS" -- "${COMP_WORDS[COMP_CWORD]}"`)
+	return 0
+}
+complete -F _artisan artisan

home/app/run-dev.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 "$@"

home/app/run-prod.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/.bashrc

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

home/app/entrypoint.sh renamed to root/entrypoint.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/modules/cache.sh

@@ -4,7 +4,7 @@
 ; Resource Limits ;
 ;;;;;;;;;;;;;;;;;;;
 
-max_execution_time = 60
+max_execution_time = ${PHP_MAX_EXECUTION_TIME}
 max_input_time = 60
 memory_limit = ${PHP_MEMORY_LIMIT}
 
@@ -56,3 +56,10 @@ opcache.memory_consumption=${PHP_OPCACHE_MEMORY_CONSUMPTION}
 opcache.max_wasted_percentage=${PHP_OPCACHE_MAX_WASTED_PERCENTAGE}
 opcache.interned_strings_buffer=16
 opcache.fast_shutdown=1
+
+;;;;;;;;;;;;;;;;;
+; Miscellaneous ;
+;;;;;;;;;;;;;;;;;
+
+; http://www.php.net/manual/en/ini.core.php#ini.expose-php
+expose_php = Off