Remove chmod for rootfs files

* Move v4/5 files to separate folders

* Updated github build_push.yml action

* Updated docker-compose.yml

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,20 +7,52 @@ assignees: ''
 
 ---
 
-# Before creating an issue
+<!-- 
+*** Before creating an issue ***
+*** Be sure the issue isn't yet reported here or dicussed on stackoverflow ***
+-->
 
-Be sure the issue isn't yet reported here or dicussed on stackoverflow
+**Setup information**
+<!-- Remove accordingly -->
+docker run / docker-compose / Helm
 
-# Logs
+**Describe the bug**
+A clear and concise description of what the bug is.
 
-Did you check the logs ?
-If any Error is present there please copy/paste it below 
+**To reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
 
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots/logs**
+If applicable, add screenshots to help explain your problem.
+
+<!-- Did you check the logs? If any Error is present there please copy/paste it below -->
 ```
 Any Error that sucks
 ```
 
-# Setup information
+**Docker/Kubernetes/Helm**:
+- Output of `docker version`:
+```
+(paste your output here)
+```
+<!-- Additional info if using helm on k8s, add the info below -->
+<!-- Delete this block if not applicable -->
+- Output of `helm version`:
+```
+(paste your output here)
+```
+- Output of `kubectl version`:
+```
+(paste your output here)
+```
+<!-- End Additional info if using helm on k8s -->
 
-What version do you run?
-Do you run docker-compose or a single Dockerfile ?
+**Additional context**
+Add any other context about the problem here.

.github/workflows/build_push.yml

@@ -1,36 +1,77 @@
-name: Docker images
+name: Publish Releases to Hub
 
+# When its time to do a release do a full cross platform build for all supported
+# architectures and push all of them to Docker Hub.
+# Only trigger on semver shaped tags.
+# Ref: https://github.com/metcalfc/docker-action-examples/blob/main/.github/workflows/release.yml
 on:
   push:
     tags-ignore:
       - "invoiceninja-*"
 
 jobs:
-  deploy:
-    name: Build images
+  docker:
     runs-on: ubuntu-latest
-
     steps:
-        - uses: actions/checkout@v1
+      - name: Checkout
+        uses: actions/checkout@v2
 
-        - name: Login to DockerHub
-          run: echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
+      - name: Prepare
+        id: prep
+        run: |
+          DOCKER_IMAGE=invoiceninja/invoiceninja
+          VERSION=edge
+          if [[ $GITHUB_REF == refs/tags/* ]]; then
+            VERSION=${GITHUB_REF#refs/tags/}
+          fi
+          TAGS="${DOCKER_IMAGE}:${VERSION}"
+          MAJOR="$(echo "${VERSION}" | cut -d. -f1)"
+          MINOR="$(echo "${VERSION}" | cut -d. -f2)"
+          TAGS="$TAGS,${DOCKER_IMAGE}:${MAJOR},${DOCKER_IMAGE}:${MAJOR}.${MINOR}"
+          if [[ $VERSION =~ ^5\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
+            TAGS="$TAGS,${DOCKER_IMAGE}:latest"
+          fi
+          echo ::set-output name=tags::${TAGS}
+          echo ::set-output name=version::${VERSION}
+          echo ::set-output name=major::${MAJOR}
 
-        - name: Get the latest tag
-          id: vars
-          run: echo ::set-output name=tag::$(echo ${GITHUB_REF:10})
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+        with:
+          platforms: all
 
-        - name: Build image from alpine - v5
-          run: make build-alpine-v5 TAG="${{steps.vars.outputs.tag}}"
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
 
-        - name: Push alpine-based image - v5
-          run: make push-alpine-v5 TAG="${{steps.vars.outputs.tag}}"
+      - name: Cache Docker layers
+        uses: actions/cache@v2
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
 
-        - name: Build image from alpine - v4
-          run: make build-alpine TAG="${{steps.vars.outputs.tag}}"
+      - name: Login to DockerHub
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
 
-        - name: Push alpine-based image - v4
-          run: make push-alpine TAG="${{steps.vars.outputs.tag}}"
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v2
+        with:
+          builder: ${{ steps.buildx.outputs.name }}
+          context: ./alpine/${{ steps.prep.outputs.major }}/
+          build-args: INVOICENINJA_VERSION=${{ steps.prep.outputs.version }}
+          target: prod
+          platforms: linux/amd64,linux/arm64
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.prep.outputs.tags }}
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache
 
-        - name: Logout from DockerHub
-          run: docker logout
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}

.github/workflows/charts.yaml

@@ -1,6 +1,9 @@
 name: Lint and Test Charts
 
-on: pull_request
+on:
+  pull_request:
+    paths:
+      - "charts/**"
 
 jobs:
   lint-chart:

Makefile

@@ -23,7 +23,7 @@ VERSION=$(shell echo ${TAG} | sed "s/-.*//")
 build-alpine:
 ifeq ($(IS_V5),)
 	$(info Make: Building "$(VERSION)" tagged images from alpine.)
-	@docker build -t ${HUB_NAMESPACE}/${IMAGE}:alpine-${VERSION} --build-arg INVOICENINJA_VERSION=${VERSION} --file ./alpine/Dockerfile .
+	@docker build -t ${HUB_NAMESPACE}/${IMAGE}:alpine-${VERSION} --build-arg INVOICENINJA_VERSION=${VERSION} ./alpine/4/
 	# Tag as alpine-4
 	@docker tag ${HUB_NAMESPACE}/${IMAGE}:alpine-${VERSION} ${HUB_NAMESPACE}/${IMAGE}:alpine-4
 	$(info Make: Done.)
@@ -42,7 +42,7 @@ endif
 build-alpine-v5:
 ifneq ($(IS_V5),)
 	$(info Make: Building "$(VERSION)" tagged images from alpine.)
-	@docker build -t ${HUB_NAMESPACE}/${IMAGE}:${VERSION} --build-arg INVOICENINJA_VERSION=${VERSION} --file ./alpine/Dockerfile_v5 .
+	@docker build -t ${HUB_NAMESPACE}/${IMAGE}:${VERSION} --build-arg INVOICENINJA_VERSION=${VERSION} ./alpine/5/
 	@docker tag ${HUB_NAMESPACE}/${IMAGE}:${VERSION} ${HUB_NAMESPACE}/${IMAGE}:5
 	@docker tag ${HUB_NAMESPACE}/${IMAGE}:${VERSION} ${HUB_NAMESPACE}/${IMAGE}:latest
 	$(info Make: Done.)

README.md

@@ -19,7 +19,7 @@
 
 The dockerfile has been revamped to make is easier to get started, by default the base image selected in 5 which will pull in the latest v5 stable image.
 
-```
+```bash
 git clone https://github.com/invoiceninja/dockerfiles.git
 cd dockerfiles
 ```
@@ -32,6 +32,7 @@ APP_KEY=<insert your generated key in here>
 APP_DEBUG=true
 MULTI_DB_ENABLED=false
 DB_HOST1=db
+DB_PORT1=3306
 DB_USERNAME1=ninja
 DB_PASSWORD1=ninja
 DB_DATABASE1=ninja
@@ -52,6 +53,18 @@ From the terminal run
 
 ```sudo chown -R 1500:1500 docker/app```
 
+## Updating the image when using `docker-compose`
+
+As `docker-compose` does not support any form of version control, this git provide updates to `docker-compose.yml` directly. 
+
+To upgrade to a newer release image, please make sure to update the `docker-compose.yml` first by running
+
+```bash
+git pull
+```
+
+You may need to manually merge any changes that cannot be merged automatically by git.
+
 ### Note for people running the container locally on their PC ###
 
 If you are running the container locally, then the container will need to resolve the host, to support this you will want to insert your LAN IP address and the host name in the hosts file located in ```config/hosts```
@@ -74,6 +87,3 @@ All that is left to do now is bring up the container
 ## Support
 
 If you discover a bug, please create and issue, if you query is general in nature please visit us on our [Forum ](https://forum.invoiceninja.com/)
-
-
-

alpine/4/Dockerfile

@@ -2,7 +2,7 @@ ARG PHP_VERSION=7.2
 ARG BAK_STORAGE_PATH=/var/www/app/docker-backup-storage/
 ARG BAK_PUBLIC_PATH=/var/www/app/docker-backup-public/
 
-FROM php:${PHP_VERSION}-fpm-alpine
+FROM php:${PHP_VERSION}-fpm-alpine as prod
 
 LABEL maintainer="David Bomba <turbo124@gmail.com>"
 
@@ -12,13 +12,8 @@ LABEL maintainer="David Bomba <turbo124@gmail.com>"
 ARG INVOICENINJA_VERSION
 ARG BAK_STORAGE_PATH
 ARG BAK_PUBLIC_PATH
-ENV BAK_STORAGE_PATH $BAK_STORAGE_PATH
-ENV BAK_PUBLIC_PATH $BAK_PUBLIC_PATH
-WORKDIR /var/www/app
 
-COPY entrypoint.sh /usr/local/bin/docker-entrypoint
-RUN chmod +x /usr/local/bin/docker-entrypoint \
-    && mv /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
+RUN mv /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
 
 # Install PHP extensions
 # https://hub.docker.com/r/mlocati/php-extension-installer/tags
@@ -31,26 +26,30 @@ RUN install-php-extensions \
     pdo_mysql \
     zip
 
-COPY ./config/php/php.ini /usr/local/etc/php/conf.d/in-php.ini
-
 # Separate user
 ENV INVOICENINJA_USER=invoiceninja
 
-RUN addgroup --gid=1500 -S "$INVOICENINJA_USER" && \
-    adduser --uid=1500 \
+WORKDIR /var/www/app
+
+RUN addgroup --gid=1500 -S "$INVOICENINJA_USER" \
+    && adduser --uid=1500 \
     --disabled-password \
     --gecos "" \
     --home "$(pwd)" \
     --ingroup "$INVOICENINJA_USER" \ 
     --no-create-home \
-    "$INVOICENINJA_USER"; \
-    addgroup "$INVOICENINJA_USER" www-data; \
-    chown -R "$INVOICENINJA_USER":"$INVOICENINJA_USER" .
+    "$INVOICENINJA_USER" \
+    && chown -R "$INVOICENINJA_USER":"$INVOICENINJA_USER" .
+
+COPY rootfs /
+RUN chmod +x /usr/local/bin/docker-entrypoint
 
 USER 1500
 
 # Download and install IN
 ENV INVOICENINJA_VERSION="${INVOICENINJA_VERSION}"
+ENV BAK_STORAGE_PATH $BAK_STORAGE_PATH
+ENV BAK_PUBLIC_PATH $BAK_PUBLIC_PATH
 
 RUN curl -o /tmp/ninja.zip -L https://download.invoiceninja.com/ninja-v${INVOICENINJA_VERSION}.zip \
     && unzip -q /tmp/ninja.zip -d /tmp/ \
@@ -63,6 +62,7 @@ RUN curl -o /tmp/ninja.zip -L https://download.invoiceninja.com/ninja-v${INVOICE
     && rm -rf /var/www/app/docs /var/www/app/tests
 
 # Override the environment settings from projects .env file
+ENV IS_DOCKER true
 ENV LOG errorlog
 ENV SELF_UPDATER_SOURCE ''
 

alpine/4/rootfs/usr/local/bin/docker-entrypoint

@@ -83,9 +83,7 @@ fi
 rm -rf "$BAK_PUBLIC_PATH"
 
 # Set permission for web server to create/update files (only <v4)
-if [[ ${str::1} -le 4 ]]; then 
-    chown -R "$INVOICENINJA_USER":www-data /var/www/app/storage /var/www/app/public /var/www/app/bootstrap
-fi
+chown -R "$INVOICENINJA_USER":www-data /var/www/app/storage /var/www/app/public /var/www/app/bootstrap
 
 # Initialize values that might be stored in a file
 file_env 'APP_KEY'
@@ -104,13 +102,9 @@ file_env 'S3_KEY'
 file_env 'S3_SECRET'
 
 # Run Laravel stuff
-php artisan config:cache
-php artisan optimize
-
-while ! mysqladmin ping -h "$DB_HOST1" -P $DB_PORT1 --silent; do
-    echo "Waiting for DB ($DB_HOST1:$DB_PORT1)"
-    sleep 1
-done
-php artisan migrate --force
+if [[ "$1" == "supervisord" ]] || [[ "$1" == "php-fpm" ]]; then
+    echo "Initialising Laravel..."
+    . laravel-init.sh
+fi
 
 exec docker-php-entrypoint "$@"

alpine/4/rootfs/usr/local/bin/laravel-init.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+php artisan config:cache
+php artisan optimize
+php artisan migrate --force

alpine/5/Dockerfile

@@ -3,19 +3,16 @@ ARG BAK_STORAGE_PATH=/var/www/app/docker-backup-storage/
 ARG BAK_PUBLIC_PATH=/var/www/app/docker-backup-public/
 
 # Get Invoice Ninja and install nodejs packages
-FROM node:lts-alpine as frontend
+FROM --platform=$BUILDPLATFORM node:lts-alpine as build
 ARG INVOICENINJA_VERSION
 ARG BAK_STORAGE_PATH
 ARG BAK_PUBLIC_PATH
 
-# Install dependencies
-RUN set -eux; \
-    apk add --no-cache \
-    curl
-
 # Download Invoice Ninja
-RUN curl -o /tmp/ninja.tar.gz -L https://github.com/invoiceninja/invoiceninja/tarball/v$INVOICENINJA_VERSION \
-    && mkdir -p /var/www/app \
+ADD https://github.com/invoiceninja/invoiceninja/tarball/v$INVOICENINJA_VERSION /tmp/ninja.tar.gz
+
+# Extract Invoice Ninja
+RUN mkdir -p /var/www/app \
     && tar --strip-components=1 -xf /tmp/ninja.tar.gz -C /var/www/app/ \
     && mkdir -p /var/www/app/public/logo /var/www/app/storage \
     && mv /var/www/app/.env.example /var/www/app/.env \
@@ -31,25 +28,18 @@ RUN npm install --production \
     && mv /var/www/app/public $BAK_PUBLIC_PATH  
 
 # Prepare php image
-FROM php:${PHP_VERSION}-fpm-alpine
+FROM php:${PHP_VERSION}-fpm-alpine as prod
 ARG INVOICENINJA_VERSION
 ARG BAK_STORAGE_PATH
 ARG BAK_PUBLIC_PATH
-ENV INVOICENINJA_VERSION $INVOICENINJA_VERSION
-ENV BAK_STORAGE_PATH $BAK_STORAGE_PATH
-ENV BAK_PUBLIC_PATH $BAK_PUBLIC_PATH
 
 LABEL maintainer="David Bomba <turbo124@gmail.com>"
 
-WORKDIR /var/www/app
-
-COPY --from=frontend /var/www/app /var/www/app
-
 RUN mv /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
 
 # Install PHP extensions
 # https://hub.docker.com/r/mlocati/php-extension-installer/tags
-COPY --from=mlocati/php-extension-installer:1.1.41 /usr/bin/install-php-extensions /usr/local/bin/
+COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/local/bin/
 
 RUN install-php-extensions \
     bcmath \
@@ -60,7 +50,8 @@ RUN install-php-extensions \
     opcache \
     pdo_mysql \
     zip \
-    @composer
+    @composer \
+    && rm /usr/local/bin/install-php-extensions
 
 # Install chromium
 RUN set -eux; \
@@ -71,28 +62,32 @@ RUN set -eux; \
     chromium \
     ttf-freefont
 
-COPY entrypoint.sh /usr/local/bin/docker-entrypoint
-COPY ./config/php/php.ini /usr/local/etc/php/conf.d/in-php.ini
-COPY ./config/supervisor/* /
+# Copy files
+COPY rootfs /
 
-## Separate user
+## Create user
 ARG UID=1500
-ENV INVOICENINJA_USER=invoiceninja
+ENV INVOICENINJA_USER invoiceninja
 
 RUN addgroup --gid=$UID -S "$INVOICENINJA_USER" \
     && adduser --uid=$UID \
     --disabled-password \
     --gecos "" \
-    --home "$(pwd)" \
-    --ingroup "$INVOICENINJA_USER" \ 
-    --no-create-home \
-    "$INVOICENINJA_USER" \
-    && chmod +x /usr/local/bin/docker-entrypoint \
-    && chmod +x /shutdown.sh \
-    && chown -R "$INVOICENINJA_USER":"$INVOICENINJA_USER" /var/www/app
+    --home "/var/www/app" \
+    --ingroup "$INVOICENINJA_USER" \
+    "$INVOICENINJA_USER"
+
+# Set up app
+ENV INVOICENINJA_VERSION $INVOICENINJA_VERSION
+ENV BAK_STORAGE_PATH $BAK_STORAGE_PATH
+ENV BAK_PUBLIC_PATH $BAK_PUBLIC_PATH
+COPY --from=build --chown=$INVOICENINJA_USER:$INVOICENINJA_USER /var/www/app /var/www/app
 
 USER $UID
+WORKDIR /var/www/app
 
+# Do not remove this ENV
+ENV IS_DOCKER true
 RUN /usr/local/bin/composer install --no-dev --quiet
 
 # Override the environment settings from projects .env file
@@ -101,4 +96,4 @@ ENV LOG errorlog
 ENV SNAPPDF_EXECUTABLE_PATH /usr/bin/chromium-browser
 
 ENTRYPOINT ["docker-entrypoint"]
-CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"]
+CMD ["supervisord"]

alpine/5/rootfs/etc/supervisord.conf

@@ -34,7 +34,7 @@ numprocs=2
 command=php artisan queue:work --sleep=3 --tries=1 --memory=256 --timeout=3600
 
 [eventlistener:shutdown]
-command=/shutdown.sh
+command=shutdown.sh
 events=PROCESS_STATE_STOPPED, PROCESS_STATE_EXITED, PROCESS_STATE_FATAL
 stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0

alpine/5/rootfs/usr/local/bin/docker-entrypoint

@@ -0,0 +1,107 @@
+#!/usr/bin/env sh
+set -e
+
+# logging functions
+in_log() {
+    local type="$1"
+    shift
+    printf '%s [%s] [Entrypoint]: %s\n' "$(date -u '+%Y-%m-%dT%H:%M:%SZ')" "$type" "$*"
+}
+
+in_error() {
+    in_log ERROR "$@" >&2
+    exit 1
+}
+
+# Indirect expansion (ie) is not supported in bourne shell. That's why we are using this "magic" here.
+ie_gv() {
+    eval "echo \$$1"
+}
+
+# usage: file_env VAR [DEFAULT]
+#    ie: file_env 'XYZ_DB_PASSWORD' 'example'
+# (will allow for "$XYZ_DB_PASSWORD_FILE" to fill in the value of
+#  "$XYZ_DB_PASSWORD" from a file, especially for Docker's secrets feature)
+file_env() {
+    local var="$1"
+    local fileVar="${var}_FILE"
+    local def="${2:-}"
+
+    if [ "$(ie_gv ${var})" != "" ] && [ "$(ie_gv ${fileVar})" != "" ]; then
+        in_error "Both $var and $fileVar are set (but are exclusive)"
+    fi
+
+    local val="$def"
+    if [ "$(ie_gv ${var})" != "" ]; then
+        val=$(ie_gv ${var})
+    elif [ "$(ie_gv ${fileVar})" != "" ]; then
+        val=$(cat $(ie_gv ${fileVar}))
+    fi
+
+    export "$var"="$val"
+    unset "$fileVar"
+}
+
+# first arg is `-f` or `--some-option`
+if [ "${1#-}" != "$1" ]; then
+    set -- php-fpm "$@"
+fi
+
+# create storage volume
+if [ ! -d /var/www/app/storage ] && [ -d "$BAK_STORAGE_PATH" ]; then
+    mv "$BAK_STORAGE_PATH" /var/www/app/storage
+elif [ -d "$BAK_STORAGE_PATH" ]; then
+    # copy missing folders in storage
+    IN_STORAGE_BACKUP="$(ls "$BAK_STORAGE_PATH")"
+    for path in $IN_STORAGE_BACKUP; do
+        if [ ! -e "/var/www/app/storage/$path" ]; then
+            cp -Rp "$BAK_STORAGE_PATH/$path" "/var/www/app/storage/"
+        fi
+    done
+fi
+rm -rf "$BAK_STORAGE_PATH"
+
+# create public volume
+if [ ! -d /var/www/app/public ] && [ -d "$BAK_PUBLIC_PATH" ]; then
+    mv "$BAK_PUBLIC_PATH" /var/www/app/public
+elif [ ! -e /var/www/app/public/version ] || [ "$INVOICENINJA_VERSION" != "$(cat /var/www/app/public/version)" ]; then
+    # version mismatch, update all
+    cp -au "$BAK_PUBLIC_PATH/"* /var/www/app/public
+    echo "$INVOICENINJA_VERSION" >/var/www/app/public/version
+elif [ ! -d /var/www/app/public/logo ] && [ -d "$BAK_PUBLIC_PATH/logo" ]; then
+    # missing logo folder only, copy folder
+    cp -a "$BAK_PUBLIC_PATH/logo" /var/www/app/public/logo
+elif [ -d "$BAK_PUBLIC_PATH/logo" ]; then
+    # copy missing folders in logo
+    IN_LOGO_BACKUP="$(ls "$BAK_PUBLIC_PATH/logo")"
+    for path in $IN_LOGO_BACKUP; do
+        if [ ! -e "/var/www/app/public/logo/$path" ]; then
+            cp -a "$BAK_PUBLIC_PATH/logo/$path" "/var/www/app/public/logo/"
+        fi
+    done
+fi
+rm -rf "$BAK_PUBLIC_PATH"
+
+# Initialize values that might be stored in a file
+file_env 'APP_KEY'
+file_env 'API_SECRET'
+file_env 'CLOUDFLARE_API_KEY'
+file_env 'DB_USERNAME'
+file_env 'DB_USERNAME1'
+file_env 'DB_USERNAME2'
+file_env 'DB_PASSWORD'
+file_env 'DB_PASSWORD1'
+file_env 'DB_PASSWORD2'
+file_env 'MAIL_USERNAME'
+file_env 'MAIL_PASSWORD'
+file_env 'MAILGUN_SECRET'
+file_env 'S3_KEY'
+file_env 'S3_SECRET'
+
+# Run Laravel stuff
+if [[ "$1" == "supervisord" ]] || [[ "$1" == "php-fpm" ]]; then
+    echo "Initialising Laravel..."
+    . laravel-init.sh
+fi
+
+exec docker-php-entrypoint "$@"

alpine/5/rootfs/usr/local/bin/laravel-init.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+php artisan config:cache
+php artisan optimize
+php artisan migrate --force

alpine/5/rootfs/usr/local/etc/php/conf.d/in-php.ini

@@ -0,0 +1,17 @@
+; How often (in seconds) to check file timestamps for changes to the shared
+; memory storage allocation. ("1" means validate once per second, but only
+; once per request. "0" means always validate)
+;opcache.revalidate_freq=2
+opcache.revalidate_freq=60
+
+# http://symfony.com/doc/current/performance.html
+; Duration of time, in seconds for which to cache realpath information for a given
+; file or directory. For systems with rarely changing files, consider increasing this
+; value.
+; http://php.net/realpath-cache-ttl
+;realpath_cache_ttl = 120                                                                                                                        
+realpath_cache_ttl = 600
+
+; Maximum allowed size for uploaded files.                                                                                                                      
+; http://php.net/upload-max-filesize                                                                                                                            
+upload_max_filesize = 8M

docker-compose.yml

@@ -9,8 +9,7 @@ services:
       # Vhost configuration
       #- ./config/caddy/Caddyfile:/etc/caddy/Caddyfiledocker-com
       - ./config/nginx/in-vhost.conf:/etc/nginx/conf.d/in-vhost.conf:ro
-      - ./docker/app/public:/var/www/app/public:rw,delegated
-      - ./docker/app/storage:/var/www/app/storage:rw,delegated
+      - ./docker/app/public:/var/www/app/public:ro
     depends_on:
       - app
     # Run webserver nginx on port 80
@@ -29,7 +28,6 @@ services:
     restart: always
     volumes:
       - ./config/hosts:/etc/hosts:ro
-      - ./config/shutdown.sh:/usr/local/bin/shutdown.sh
       - ./docker/app/public:/var/www/app/public:rw,delegated
       - ./docker/app/storage:/var/www/app/storage:rw,delegated
     depends_on: