Use registry cache

Use Redis Sentinel for chart (#317 )
* Added sentinel config * Bump chart version * Fix trailing space
2026-01-06 14:37:26 +01:00 · 2021-04-07 00:47:20 +08:00 · 2021-04-06 18:18:34 +08:00 · 2021-04-06 09:29:04 +08:00 · 2021-04-05 17:31:27 +08:00 · 2021-03-29 22:20:33 +08:00
27 changed files with 651 additions and 135 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.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.
--- a/.github/workflows/build_push.yml
+++ b/.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: invoiceninja/invoiceninja:${{ steps.prep.outputs.major }}
+          cache-to: type=inline

-        - name: Logout from DockerHub
-          run: docker logout
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}
--- a/.github/workflows/charts.yaml
+++ b/.github/workflows/charts.yaml
@@ -1,6 +1,9 @@
 name: Lint and Test Charts

-on: pull_request
+on:
+  pull_request:
+    paths:
+      - "charts/**"

 jobs:
  lint-chart:
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,7 @@ ehthumbs.db
 Thumbs.db

 # Helm
-charts/**/charts/
+charts/**/charts/
+
+# Compose filesystem
+/docker
--- a/4
+++ b/4
@@ -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.)
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 [![Docker image, latest](https://img.shields.io/docker/image-size/invoiceninja/invoiceninja/latest?label=latest)](https://hub.docker.com/r/invoiceninja/invoiceninja)
 [![Docker image, alpine](https://img.shields.io/docker/image-size/invoiceninja/invoiceninja/alpine?label=alpine)](https://hub.docker.com/r/invoiceninja/invoiceninja)

-# Docker for [Invoice Ninja](https://www.invoiceninja.com/) 
+# Docker for [Invoice Ninja](https://www.invoiceninja.com/)

 :crown: **Features**

@@ -13,18 +13,18 @@

 ## You want some Kubernetes + Helm with that?
 [Helm Chat](https://github.com/Saddamus/invoiceninja-helm) by @Saddamus  
-[Kubernetes](https://github.com/invoiceninja/dockerfiles/issues/94) by @spacepluk 
+[Kubernetes](https://github.com/invoiceninja/dockerfiles/issues/94) by @spacepluk

 ## Quickstart V5 Launch

-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.
+The dockerfile has been revamped to make it easier to get started, by default the base image selected is 5 which will pull in the latest v5 stable image.

-```
+```bash
 git clone https://github.com/invoiceninja/dockerfiles.git
 cd dockerfiles
 ```

-Instead of defining our environment variables inside our docker-compose.yml file we now define this in the ```env``` file, open this file up and insert your APP_URL and your APP_KEY
+Instead of defining our environment variables inside our docker-compose.yml file we now define this in the `env` file, open this file up and insert your `APP_URL` and your `APP_KEY`

 ```
 APP_URL=http://in.localhost:8003/
@@ -32,25 +32,29 @@ 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
 PHANTOMJS_PDF_GENERATION=false
 ```

-The ```APP_KEY``` can be generated by running
+The `APP_KEY` can be generated by running

-```
+```bash
 docker run --rm -it invoiceninja/invoiceninja php artisan key:generate --show
 ```

-Copy the entire string and insert in the env file at ```APP_KEY=base64....```
+Copy the entire string and insert in the env file at `APP_KEY=base64....`

-To ensure folder permissions are correct when the container comes up for the first time it is important that you set the correct folder permissions on the ```docker``` folder.
+To ensure folder permissions are correct when the container comes up for the first time it is important that you set the correct folder permissions on the `docker` folder.

 From the terminal run

-```sudo chown -R 1500:1500 docker/app```
+```bash
+chmod 755 docker/app/public
+sudo chown -R 1500:1500 docker/app
+```

 ### Note for people running the container locally on their PC ###

@@ -61,7 +65,7 @@ For example, lets say your APP_URL is ```http://in5.test:8000``` and your LAN IP

 ```192.168.0.124 in5.test```

-**Please note that PDF generation using local host your domain name MUST end in .test for your PDFs to generate correctly, this is a DNS resolver issue with chromium.
+**Please note that for PDF generation using local host, your domain name MUST end in .test for your PDFs to generate correctly, this is a DNS resolver issue with chromium.

 All that is left to do now is bring up the container

@@ -71,9 +75,22 @@ All that is left to do now is bring up the container

 **Note: When performing the setup, the Database host is ```db```

+### Running on ARM64 (Raspberry Pi 4)
+
+When deploying on an ARM64 system, you need to comment out the `image: mysql:5` line and uncomment `image: mariadb:10.4` in the `docker-compose.yml` file.
+
+## 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.
+
 ## 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/)
-
-
-
--- a/alpine/4/Dockerfile
+++ b/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 ''

--- a/alpine/4/rootfs/etc/php/conf.d/in-php.ini
+++ b/alpine/4/rootfs/etc/php/conf.d/in-php.ini
--- a/alpine/4/rootfs/usr/local/bin/docker-entrypoint
+++ b/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 "$@"
--- a/alpine/4/rootfs/usr/local/bin/laravel-init.sh
+++ b/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
--- a/alpine/Dockerfile_v5
+++ b/alpine/Dockerfile_v5
@@ -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"]
--- a/alpine/5/rootfs/etc/supervisord.conf
+++ b/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
--- a/alpine/5/rootfs/usr/local/bin/docker-entrypoint
+++ b/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 "$@"
--- a/alpine/5/rootfs/usr/local/bin/laravel-init.sh
+++ b/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
--- a/alpine/5/rootfs/usr/local/bin/shutdown.sh
+++ b/alpine/5/rootfs/usr/local/bin/shutdown.sh
--- a/alpine/5/rootfs/usr/local/etc/php/conf.d/in-php.ini
+++ b/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
--- a/charts/invoiceninja/Chart.lock
+++ b/charts/invoiceninja/Chart.lock
@@ -1,12 +1,15 @@
 dependencies:
 - name: common
  repository: https://charts.bitnami.com/bitnami
-  version: 1.4.1
+  version: 1.4.2
 - name: nginx
  repository: https://charts.bitnami.com/bitnami
  version: 8.8.0
 - name: mariadb
  repository: https://charts.bitnami.com/bitnami
-  version: 9.3.5
-digest: sha256:d809702ee601a8a0019defb9ee3fc5a5b5332968e1038cca8b44d5332b14a275
-generated: "2021-03-23T00:33:02.690189+08:00"
+  version: 9.3.6
+- name: redis
+  repository: https://charts.bitnami.com/bitnami
+  version: 12.9.0
+digest: sha256:008659600506cbc8dd5c9b8e96ce81430e4d8582368646469aa17a37441f5bbc
+generated: "2021-03-29T18:41:17.978475+08:00"
--- a/charts/invoiceninja/Chart.yaml
+++ b/charts/invoiceninja/Chart.yaml
@@ -13,11 +13,11 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
+version: 0.3.0
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 5.1.30
+appVersion: 5.1.35
 keywords:
  - invoiceninja
 home: https://github.com/lwj5/invoiceninja-chart
@@ -37,6 +37,10 @@ dependencies:
    name: mariadb
    repository: https://charts.bitnami.com/bitnami
    version: 9.3.x
+  - condition: redis.enabled
+    name: redis
+    repository: https://charts.bitnami.com/bitnami
+    version: 12.9.x
 maintainers:
  - email: lwj5@hotmail.com
    name: lwj5
--- a/charts/invoiceninja/README.md
+++ b/charts/invoiceninja/README.md
@@ -78,6 +78,12 @@ The following table shows the configuration options for the Invoiceninja helm ch
 | `serviceAccountName` | Name of a service account for the Invoiceninja pods             | `default`                                               |
 | `debug`              | Turn on debug mode on Invoiceninja                              | `false`                                                 |
 | `appKey`             | Laravel Application Key                                         | _random 32 character alphanumeric string_               |
+| `logChannel`         | Name of log channel to use                                      | `nil`                                                   |
+| `broadcastDriver`    | Name of broadcast driver to use                                 | `nil`                                                   |
+| `cacheDriver`        | Name of cache driver to use                                     | `nil`                                                   |
+| `sessionDriver`      | Name of session driver to use                                   | `nil`                                                   |
+| `queueConnection`    | Name of queue connection to use                                 | `nil`                                                   |
+| `snappdf`            | Use snappdf instead of Phantom JS PDF generation                | `true`                                                  |
 | `extraEnvVars`       | Extra environment variables to be set on Invoiceninja container | `{}`                                                    |
 | `extraEnvVarsCM`     | Name of existing ConfigMap containing extra env vars            | `nil`                                                   |
 | `extraEnvVarsSecret` | Name of existing Secret containing extra env vars               | `nil`                                                   |
@@ -150,15 +156,39 @@ The following table shows the configuration options for the Invoiceninja helm ch
 | `persistence.storage.size`          | PVC Storage Request                      | `5Gi`             |
 | `persistence.storage.dataSource`    | PVC data source                          | `{}`              |

+### Redis parameters
+
+| Parameter                         | Description                                  | Default |
+| --------------------------------- | -------------------------------------------- | ------- |
+| `redis.enabled`                   | If external redis is used, set it to `false` | `true`  |
+| `redis.password`                  | Redis password                               | `nil`   |
+| `redis.usePassword`               | Use redis password                           | `false` |
+| `redis.sentinel.enabled`          | Enable sentinel containers                   | `true`  |
+| `redis.sentinel.usePassword`      | Use password for sentinel containers         | `false` |
+| `externalRedis.host`              | Host of the external redis                   | `nil`   |
+| `externalRedis.port`              | Port of the external redis                   | `6379`  |
+| `externalRedis.password`          | Password for the external redis              | `nil`   |
+| `externalRedis.sentinel`          | Using sentinels                              | `false` |
+| `externalRedis.databases.default` | Database to use by default                   | `0`     |
+| `externalRedis.databases.cache`   | Database to use by cache                     | `1`     |
+
+> See [Dependencies](#dependencies) for more.
+
 ### Database parameters 

-| Parameter                   | Description                          | Default                                   |
-| --------------------------- | ------------------------------------ | ----------------------------------------- |
-| `mariadb.enabled`           | Deploy MariaDB container(s)          | `true`                                    |
-| `mariadb.auth.rootPassword` | Password for the MariaDB `root` user | _random 10 character alphanumeric string_ |
-| `mariadb.auth.database`     | Database name to create              | `invoiceninja`                            |
-| `mariadb.auth.username`     | Database user to create              | `invoiceninja`                            |
-| `mariadb.auth.password`     | Password for the database            | _random 10 character alphanumeric string_ |
+| Parameter                         | Description                                 | Default                                   |
+| --------------------------------- | ------------------------------------------- | ----------------------------------------- |
+| `mariadb.enabled`                 | Deploy MariaDB container(s)                 | `true`                                    |
+| `mariadb.auth.rootPassword`       | Password for the MariaDB `root` user        | _random 10 character alphanumeric string_ |
+| `mariadb.auth.database`           | Database name to create                     | `invoiceninja`                            |
+| `mariadb.auth.username`           | Database user to create                     | `invoiceninja`                            |
+| `mariadb.auth.password`           | Password for the database                   | _random 10 character alphanumeric string_ |
+| `externalDatabase.host`           | Host of the external database               | `nil`                                     |
+| `externalDatabase.user`           | Existing username in the external db        | `invoiceninja`                            |
+| `externalDatabase.password`       | Password for the above username             | `nil`                                     |
+| `externalDatabase.database`       | Name of the existing database               | `invoiceninja`                            |
+| `externalDatabase.port`           | Database port number                        | `3306`                                    |
+| `externalDatabase.existingSecret` | Name of the database existing Secret Object | `nil`                                     |

 > See [Dependencies](#dependencies) for more.

--- a/charts/invoiceninja/templates/_helpers.tpl
+++ b/charts/invoiceninja/templates/_helpers.tpl
@@ -28,6 +28,15 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- printf "%s-%s" .Release.Name "nginx" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}

+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "invoiceninja.redis.fullname" -}}
+{{- printf "%s-%s" .Release.Name "redis" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+
 {{/*
 Create the name of the service account to use
 */}}
@@ -125,3 +134,99 @@ Return the MariaDB Secret Name
    {{- printf "%s" (include "invoiceninja.mariadb.fullname" .) -}}
 {{- end -}}
 {{- end -}}
+
+{{/*
+Return the Redis Hostname
+*/}}
+{{- define "invoiceninja.redisHost" -}}
+{{- if .Values.redis.enabled }}
+    {{- if .Values.redis.sentinel.enabled }}
+    {{- printf "%s-%s" (include "invoiceninja.redis.fullname" .) "headless" | trunc 63 | trimSuffix "-" -}}
+    {{- else }}
+    {{- printf "%s-%s" (include "invoiceninja.redis.fullname" .) "master" | trunc 63 | trimSuffix "-" -}}
+    {{- end -}}
+{{- else -}}
+    {{- printf "%s" .Values.externalRedis.host -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the Redis Port
+*/}}
+{{- define "invoiceninja.redisPort" -}}
+{{- if .Values.redis.enabled }}
+    {{- if .Values.redis.sentinel.enabled }}
+    {{- printf "26379" -}}
+    {{- else }}
+    {{- printf "6379" -}}
+    {{- end -}}
+{{- else -}}
+    {{- printf "%d" (.Values.externalRedis.port | int ) -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the Redis Database
+*/}}
+{{- define "invoiceninja.redisDatabase" -}}
+{{- if .Values.redis.enabled }}
+    {{- printf "0" -}}
+{{- else -}}
+    {{- printf "%s" .Values.externalRedis.databases.default -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the Redis Database
+*/}}
+{{- define "invoiceninja.redisCacheDatabase" -}}
+{{- if .Values.redis.enabled }}
+    {{- printf "1" -}}
+{{- else -}}
+    {{- printf "%s" .Values.externalRedis.databases.cache -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the Redis Secret Name
+*/}}
+{{- define "invoiceninja.redisSecretName" -}}
+{{- if .Values.externalRedis.existingSecret -}}
+    {{- printf "%s" .Values.externalRedis.existingSecret -}}
+{{- else -}}
+    {{- printf "%s" (include "invoiceninja.redis.fullname" .) -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the Broadcast Connection Name
+*/}}
+{{- define "invoiceninja.redisBroadcastConnection" -}}
+{{- if or (and .Values.redis.enabled .Values.redis.sentinel.enabled) (and .Values.externalRedis.host .Values.externalRedis.sentinel) }}
+    {{- printf "sentinel-default" -}}
+{{- else -}}
+    {{- printf "default" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the Cache Connection Name
+*/}}
+{{- define "invoiceninja.redisCacheConnection" -}}
+{{- if or (and .Values.redis.enabled .Values.redis.sentinel.enabled) (and .Values.externalRedis.host .Values.externalRedis.sentinel) }}
+    {{- printf "sentinel-cache" -}}
+{{- else -}}
+    {{- printf "cache" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the Broadcast Driver Name
+*/}}
+{{- define "invoiceninja.redisQueueConnection" -}}
+{{- if or (and .Values.redis.enabled .Values.redis.sentinel.enabled) (and .Values.externalRedis.host .Values.externalRedis.sentinel) }}
+    {{- printf "sentinel-default" -}}
+{{- else -}}
+    {{- printf "default" -}}
+{{- end -}}
+{{- end -}}
--- a/charts/invoiceninja/templates/configmap.yaml
+++ b/charts/invoiceninja/templates/configmap.yaml
@@ -12,10 +12,46 @@ metadata:
    {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
  {{- end }}
 data:
+  {{- if .Values.nginx.ingress.enabled }}
+  APP_URL: "http://{{ .Values.nginx.ingress.hostname }}/"
+  {{- else }}
  APP_URL: "http://{{ include "common.names.fullname" . }}/"
+  {{- end }}
  APP_DEBUG: {{ .Values.debug | quote }}
-  MULTI_DB_ENABLED: "false"
  DB_HOST1: {{ include "invoiceninja.databaseHost" . | quote }}
  DB_PORT1: {{ include "invoiceninja.databasePort" . | quote }}
  DB_USERNAME1: {{ include "invoiceninja.databaseUser" . | quote }}
  DB_DATABASE1: {{ include "invoiceninja.databaseName" . | quote }}
+  {{- if .Values.logChannel }}
+  LOG_CHANNEL: {{ .Values.logChannel | quote }}
+  {{- else }}
+  LOG_CHANNEL: stderr
+  {{- end }}
+  {{- if .Values.broadcastDriver }}
+  BROADCAST_DRIVER: {{ .Values.broadcastDriver | quote }}
+  {{- else if or .Values.redis.enabled .Values.externalRedis.host }}
+  BROADCAST_DRIVER: redis
+  {{- end }}
+  {{- if .Values.cacheDriver }}
+  CACHE_DRIVER: {{ .Values.cacheDriver | quote }}
+  {{- else if or .Values.redis.enabled .Values.externalRedis.host }}
+  CACHE_DRIVER: redis
+  {{- end }}
+  {{- if .Values.sessionDriver }}
+  SESSION_DRIVER: {{ .Values.sessionDriver | quote }}
+  {{- else if or .Values.redis.enabled .Values.externalRedis.host }}
+  SESSION_DRIVER: redis
+  {{- end }}
+  {{- if .Values.queueConnection }}
+  QUEUE_CONNECTION: {{ .Values.queueConnection | quote }}
+  {{- else if or .Values.redis.enabled .Values.externalRedis.host }}
+  QUEUE_CONNECTION: redis
+  {{- end }}
+  PHANTOMJS_PDF_GENERATION: {{ not .Values.snappdf | quote}}
+  REDIS_HOST: {{ include "invoiceninja.redisHost" . | quote }}
+  REDIS_PORT: {{ include "invoiceninja.redisPort" . | quote }}
+  REDIS_DB: {{ include "invoiceninja.redisDatabase" . | quote }}
+  REDIS_CACHE_DB: {{ include "invoiceninja.redisCacheDatabase" . | quote }}
+  REDIS_BROADCAST_CONNECTION: {{ include "invoiceninja.redisBroadcastConnection" . | quote }}
+  REDIS_CACHE_CONNECTION: {{ include "invoiceninja.redisCacheConnection" . | quote }}
+  REDIS_QUEUE_CONNECTION: {{ include "invoiceninja.redisQueueConnection" . | quote }}
--- a/charts/invoiceninja/templates/deployment.yaml
+++ b/charts/invoiceninja/templates/deployment.yaml
@@ -54,6 +54,36 @@ spec:
      {{- end }}
      securityContext:
        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      initContainers:
+        - name: wait-db
+          image: {{ include "invoiceninja.image" . }}
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          command:
+            - /bin/sh
+            - -cx
+            - |
+              COUNTER=0;
+              while [  $COUNTER -lt 120 ]; do
+                if mysqladmin ping -h "$DB_HOST1" -P $DB_PORT1 --silent; then
+                  exit 0;
+                fi;
+                let COUNTER=COUNTER+1;
+                echo "Waiting for DB ($DB_HOST1:$DB_PORT1)"
+                sleep 2;
+              done;
+              echo "Did NOT see a database after 240 secs!";
+              exit 1;
+          securityContext:
+            {{- toYaml .Values.containerSecurityContext | nindent 12 }}
+          {{- if .Values.resources }}
+          resources: {{- toYaml .Values.resources | nindent 12 }}
+          {{- end }}
+          envFrom:
+            - configMapRef:
+                name: {{ include "common.names.fullname" . }}
+        {{- if .Values.initContainers }}
+          {{- include "common.tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }}
+        {{- end }}
      containers:
        - name: {{ .Chart.Name }}
          securityContext:
@@ -98,13 +128,18 @@ spec:
                name: {{ include "common.tplvalues.render" (dict "value" .Values.extraEnvVarsSecret "context" $) }}
            {{- end }}
          env:
-            - name: IS_DOCKER
-              value: "true"
            - name: DB_PASSWORD1
              valueFrom:
                secretKeyRef:
                  name: {{ include "invoiceninja.databaseSecretName" . }}
                  key: mariadb-password
+            {{- if not (and .Values.redis.enabled (not .Values.redis.usePassword)) }}
+            - name: REDIS_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "invoiceninja.redisSecretName" . }}
+                  key: redis-password
+            {{- end }}
            {{- if .Values.extraEnvVars }}
              {{- include "common.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }}
            {{- end }}
--- a/charts/invoiceninja/templates/secret.yaml
+++ b/charts/invoiceninja/templates/secret.yaml
@@ -16,6 +16,27 @@ type: Opaque
 data:
  mariadb-password: {{ .Values.externalDatabase.password | b64enc | quote }}
 {{- end }}
+
+---
+{{- if not (or .Values.redis.enabled .Values.externalDatabase.existingSecret) }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "invoiceninja.redis.fullname" . }}
+  labels:
+    {{- include "common.labels.standard" $ | nindent 4 }}
+    {{- if .Values.commonLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- end }}
+  {{- if .Values.commonAnnotations }}
+  annotations: 
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+type: Opaque
+data:
+  redis-password: {{ .Values.externalRedis.password | b64enc | quote }}
+{{- end }}
+
 ---
 apiVersion: v1
 kind: Secret
--- a/charts/invoiceninja/values.yaml
+++ b/charts/invoiceninja/values.yaml
@@ -18,7 +18,7 @@
 image:
  registry: docker.io
  repository: invoiceninja/invoiceninja
-  tag: 5.1.31
+  tag: 5.1.35
  ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
  ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
  ##
@@ -38,6 +38,30 @@ debug: false
 ##
 appKey: ""

+## Name of log channel to use
+##
+logChannel: ""
+
+## Name of broadcast driver to use
+##
+broadcastDriver: ""
+
+## Name of cache driver to use
+##
+cacheDriver: ""
+
+## Name of session driver to use
+##
+sessionDriver: ""
+
+## Name of queue connection to use
+##
+queueConnection: ""
+
+## Use local or Phantom JS PDF generation
+##
+snappdf: true
+
 ## String to partially override fullname template (will maintain the release name)
 ##
 # nameOverride:
@@ -306,6 +330,43 @@ autoscaling:
  targetCPUUtilizationPercentage: 80
  # targetMemoryUtilizationPercentage: 80

+## Redis chart configuration
+## ref: https://github.com/bitnami/charts/blob/master/bitnami/redis/values.yaml
+##
+redis:
+  enabled: true
+  usePassword: false
+  sentinel:
+    enabled: true
+    usePassword: false
+
+## External Redis Configuration
+##
+## All of these values are only used when redis.enabled is set to false
+##
+externalRedis:
+  ## Redis/Sentinel host
+  ##
+  host: ""
+  ## Redis/Sentinel port number
+  ##
+  port: 6379
+  ## Redis password
+  ##
+  password: ""
+  ## Use existing secret (ignores previous password)
+  ## must contain key `redis-password`
+  ## NOTE: When it's set, the `externalRedis.password` parameter is ignored
+  ##
+  # existingSecret:
+  ## Whether Redis Sentinel are used
+  sentinel: false
+  ## Redis databases
+  ##
+  databases:
+    default: "0"
+    cache: "1"
+
 ## MariaDB chart configuration
 ## ref: https://github.com/bitnami/charts/blob/master/bitnami/mariadb/values.yaml
 ##
@@ -333,7 +394,7 @@ mariadb:
 externalDatabase:
  ## Database host
  ##
-  host: localhost
+  host: ""
  ## non-root Username for Invoiceninja Database
  ##
  user: invoiceninja
--- a/config/mysql/Dockerfile
+++ b/config/mysql/Dockerfile
@@ -1,4 +1,6 @@
 FROM mysql:5
+# When running on ARM64 use MariaDB instead of MySQL
+#FROM mariadb:10.4
 ENV force_color_prompt yes

 RUN apt-get update;
@@ -7,4 +9,4 @@ RUN apt-get install -y cron;
 ENTRYPOINT \
  service cron start; \
  printenv | grep -v "no_proxy" >> /etc/environment; \
-  docker-entrypoint.sh mysqld
+  docker-entrypoint.sh mysqld
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,13 +9,12 @@ 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
    # Feel free to modify depending what port is already occupied
-    ports: 
+    ports:
      - "80:80"
      #- "443:443"
    networks:
@@ -29,29 +28,26 @@ 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:
      - db
-    networks: 
-      - invoiceninja  
+    networks:
+      - invoiceninja
    extra_hosts:
      - "in5.localhost:192.168.0.124 " #host and ip

  db:
    image: mysql:5
+#    When running on ARM64 use MariaDB instead of MySQL
+#    image: mariadb:10.4
 #    For auto DB backups comment out image and use the build block below
 #    build:
 #      context: ./config/mysql
    ports:
      - "3305:3306"
    restart: always
-    environment: 
-      - MYSQL_ROOT_PASSWORD=ninjaAdm1nPassword
-      - MYSQL_USER=ninja
-      - MYSQL_PASSWORD=ninja
-      - MYSQL_DATABASE=ninja
+    env_file: env
    volumes:
      - ./docker/mysql/data:/var/lib/mysql:rw,delegated

@@ -84,7 +80,7 @@ services:
  #     EOF'
  #   networks:
  #     - invoiceninja
-  #     
+  #

 networks:
-  invoiceninja:
+  invoiceninja:
--- a/4
+++ b/4
@@ -7,6 +7,10 @@ DB_PORT1=3306
 DB_USERNAME1=ninja
 DB_PASSWORD1=ninja
 DB_DATABASE1=ninja
+MYSQL_ROOT_PASSWORD=ninjaAdm1nPassword
+MYSQL_USER=ninja
+MYSQL_PASSWORD=ninja
+MYSQL_DATABASE=ninja

 #this is a system variable please do not remove
 IS_DOCKER=true
Author	SHA1	Message	Date
Ween Jiann	11c8901fe4	Use registry cache	2021-04-07 00:47:20 +08:00
Ween Jiann	3814e957e0	Use Redis Sentinel for chart (#317 ) * Added sentinel config * Bump chart version * Fix trailing space	2021-04-06 18:18:34 +08:00
Thibaut De Muynck	62b1d8cb94	Added MariaDB to Docker compose for ARM64 (#315 ) * Added option to use MariaDB instead of MySQL * Moved MYSQL environment variables to env file	2021-04-06 09:29:04 +08:00
Ween Jiann	4cd773700e	Update .gitignore	2021-04-05 17:31:27 +08:00
Ween Jiann	9f6e086633	Added Redis to Chart (#312 ) * Added redis to chart * Add snappdf config * Updated configmap * Updated appVersion	2021-03-29 22:20:33 +08:00
Ween Jiann	8df49feaf8	Update README.md	2021-03-29 00:54:57 +08:00
Ween Jiann	de856d0a88	Remove chmod for rootfs files	2021-03-28 23:39:37 +08:00
Ween Jiann	1f7458c9f7	Update build_push.yml	2021-03-28 23:16:04 +08:00
Ween Jiann	40e3add863	Update README.md	2021-03-28 14:47:40 +08:00
Ween Jiann	f4f8c79ce7	Split docker v4 and v5 files to different directories (#310 ) * Move v4/5 files to separate folders * Updated github build_push.yml action * Updated docker-compose.yml	2021-03-28 14:18:54 +08:00
Ween Jiann	524e79c486	Build on ARM64 (#307 ) * Updated Dockerfile for multiplatform * Added linux/arm64 to build_push.yml	2021-03-26 09:09:37 +08:00
Ween Jiann	4ec70c8da6	Reshuffle Dockerfile to optimise caching (#306 ) * Refactor alpine folder * Rearrange Dockerfile * Updated build_push.yml for testing * Updated build_push.yml for production * Added IS_DOCKER env * Added target to build_push.yml	2021-03-25 22:05:47 +08:00
Ween Jiann	176e2c96d6	Fixed entrypoint chown statement (#304 ) * Fix entrypoint * Rescope chart actions	2021-03-25 11:18:23 +08:00
Ween Jiann	36db897022	Update bug_report.md	2021-03-24 23:58:14 +08:00