Merge pull request #845 from Thulium-Drake/fix_init

Ensure that the target folder is present before copying files into it

.github/ct-install.yaml

@@ -3,4 +3,4 @@ chart-dirs:
 chart-repos:
   - bitnami=https://charts.bitnami.com/bitnami
 check-version-increment: true
-debug: true
+debug: false

.github/workflows/auto-close-issues.yml

@@ -0,0 +1,19 @@
+name: Close stale issues after 5 days
+on:
+  schedule:
+    - cron: "0 0 * * *"
+
+jobs:
+  close-issues:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+    steps:
+      - uses: actions/stale@v10
+        with:
+          days-before-issue-stale: 4
+          days-before-issue-close: 1
+          stale-issue-label: "stale"
+          close-issue-message: "This issue has been automatically closed due to inactivity for 5 days."
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          exempt-issue-labels: "keep-open,triage,bug"

.github/workflows/build-image-debian.yaml

@@ -0,0 +1,49 @@
+name: Build Debian Container Image
+
+on:
+  pull_request:
+    paths:
+      - ".github/**"
+      - "debian/**"
+  push:
+    paths:
+      - ".github/**"
+      - "debian/**"
+
+env:
+  REGISTRY_IMAGE: invoiceninja/invoiceninja-debian
+
+jobs:
+  build:
+    runs-on: ${{ startsWith(matrix.platform, 'linux/arm') && 'ubuntu-24.04-arm' || 'ubuntu-latest' }}
+    strategy:
+      fail-fast: false
+      matrix:
+        platform:
+          - linux/amd64
+          - linux/arm64
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v5
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY_IMAGE }}
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build
+        id: build
+        uses: docker/build-push-action@v6
+        with:
+          context: debian
+          platforms: ${{ matrix.platform }}
+          labels: ${{ steps.meta.outputs.labels }}
+          tags: ${{ env.REGISTRY_IMAGE }}
+          outputs: type=image,push-by-digest=true,name-canonical=true
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/build_push.yml

@@ -1,77 +0,0 @@
-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:
-  docker:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - 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: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-        with:
-          platforms: all
-
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v1
-
-      # - 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: Login to DockerHub
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
-      - 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: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}

.github/workflows/publish-image-debian.yaml

@@ -0,0 +1,166 @@
+name: Publish Debian Container Images
+
+on:
+  push:
+    tags-ignore:
+      - "invoiceninja-*"
+
+env:
+  REGISTRY_IMAGE: invoiceninja/invoiceninja-debian
+
+jobs:
+  version:
+    runs-on: ubuntu-latest
+    outputs:
+      version: ${{ steps.version.outputs.version }}
+      major: ${{ steps.version.outputs.major }}
+      minor: ${{ steps.version.outputs.minor }}
+      url: ${{ steps.version.outputs.url }}
+    steps:
+      - id: version
+        run: |
+
+          VERSION=edge
+          if [[ $GITHUB_REF == refs/tags/* ]]; then
+            VERSION=${GITHUB_REF#refs/tags/}
+            # Remove -o or -d suffix if present
+            VERSION=${VERSION%-*}
+          fi
+          MAJOR="$(echo "${VERSION}" | cut -d. -f1)"
+          MINOR="$(echo "${VERSION}" | cut -d. -f2)"
+          URL=https://github.com/invoiceninja/invoiceninja/releases/download/v${VERSION}/invoiceninja.tar.gz
+
+          # Debug output
+          echo "Current version: ${VERSION}"
+          echo "Version pattern check: $([[ $VERSION =~ ^5\.[0-9]{1,3}\.[0-9]{1,3}$ ]] && echo "matches" || echo "doesn't match")"
+
+          echo "version=${VERSION}" >> $GITHUB_OUTPUT
+          echo "major=${MAJOR}" >> $GITHUB_OUTPUT
+          echo "minor=${MINOR}" >> $GITHUB_OUTPUT
+          echo "url=${URL}" >> $GITHUB_OUTPUT
+
+  build:
+    runs-on: ${{ startsWith(matrix.platform, 'linux/arm') && 'ubuntu-24.04-arm' || 'ubuntu-latest' }}
+    needs:
+      - version
+    strategy:
+      fail-fast: false
+      matrix:
+        platform:
+          - linux/amd64
+          - linux/arm64
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v5
+
+      - name: Prepare
+        id: prep
+        run: |
+          platform=${{ matrix.platform }}
+          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY_IMAGE }}
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build and push by digest
+        id: build
+        uses: docker/build-push-action@v6
+        with:
+          context: debian
+          build-args: URL=${{ needs.version.outputs.url }}
+          platforms: ${{ matrix.platform }}
+          labels: ${{ steps.meta.outputs.labels }}
+          tags: ${{ env.REGISTRY_IMAGE }}
+          outputs: type=image,push-by-digest=true,name-canonical=true,push=${{ github.event_name != 'pull_request' }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      - name: Export digest
+        run: |
+          mkdir -p ${{ runner.temp }}/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "${{ runner.temp }}/digests/${digest#sha256:}"
+
+      - name: Upload digest
+        uses: actions/upload-artifact@v4
+        with:
+          name: digests-${{ env.PLATFORM_PAIR }}
+          path: ${{ runner.temp }}/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  merge:
+    runs-on: ubuntu-latest
+    needs:
+      - version
+      - build
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v4
+        with:
+          path: ${{ runner.temp }}/digests
+          pattern: digests-*
+          merge-multiple: true
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY_IMAGE }}
+          tags: |
+            ${{ needs.version.outputs.version }}
+            ${{ needs.version.outputs.major }}
+            ${{ needs.version.outputs.major }}.${{ needs.version.outputs.minor }}
+            latest
+
+      - name: Create manifest list and push
+        working-directory: ${{ runner.temp }}/digests
+        if: ${{ github.event_name != 'pull_request' }}
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *)
+
+      - name: Inspect image
+        if: ${{ github.event_name != 'pull_request' }}
+        run: |
+          docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }}
+
+  Description:
+    if: ${{ github.event_name != 'pull_request' }}
+    runs-on: ubuntu-latest
+    needs:
+      - merge
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v5
+        with:
+          sparse-checkout: "README.md"
+
+      - name: Docker Hub Description
+        uses: peter-evans/dockerhub-description@v4
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+          repository: ${{ env.REGISTRY_IMAGE }}

.github/workflows/release-chart.yaml

@@ -12,21 +12,23 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Configure Git
         run: |
           git config user.name "$GITHUB_ACTOR"
           git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
 
-      - uses: azure/setup-helm@v1
-        id: install
+      - name: Set up Helm
+        uses: azure/setup-helm@v3
 
       - name: Add Helm repos
         run: |
           helm repo add bitnami https://charts.bitnami.com/bitnami
 
       - name: Run chart-releaser
-        uses: helm/chart-releaser-action@master
+        uses: helm/chart-releaser-action@v1.4.1
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/test-charts.yaml

@@ -12,20 +12,20 @@ jobs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Fetch history
-        run: git fetch --prune --unshallow
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Set up Helm
-        uses: azure/setup-helm@v1
+        uses: azure/setup-helm@v3
 
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v4
         with:
-          python-version: 3.7
+          python-version: "3.9"
+          check-latest: true
 
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@v2.0.1
+        uses: helm/chart-testing-action@v2.3.1
 
       - name: Run chart-testing (list-changed)
         id: list-changed
@@ -41,7 +41,8 @@ jobs:
 
       - name: Run chart-testing (lint)
         run: ct lint --config .github/ct-lint.yaml
-  kubeval-chart:
+
+  kubeconform-chart:
     runs-on: ubuntu-latest
     needs:
       - lint-chart
@@ -49,50 +50,62 @@ jobs:
       matrix:
         chart: ${{ fromJson(needs.lint-chart.outputs.matrix) }}
         k8s:
-          - v1.17.11
-          - v1.18.8
-          - v1.19.4
+          - "1.25.5"
+          - "1.24.9"
+          - "1.23.15"
     steps:
       - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Update Helm depdendencies
         env:
           CHART_DIR: ${{ matrix.chart }}
         run: |
           helm dependency update "${CHART_DIR}"
-          mkdir kubeval
-          helm template "${CHART_DIR}" > kubeval/combined.yaml
+          mkdir tmp
+          helm template "${CHART_DIR}" > tmp/combined.yaml
 
-      - name: Run kubeval
-        uses: instrumenta/kubeval-action@master
+      - uses: yokawasa/action-setup-kube-tools@v0.9.2
         with:
-          files: kubeval
-          version: ${{ matrix.k8s }}
+          setup-tools: |
+            kubeconform
+
+      - name: Run kubeconform
+        if: ${{ matrix.k8s }}
+        run: kubeconform -kubernetes-version ${{ matrix.k8s }} tmp/combined.yaml
 
   install-chart:
     name: install-chart
     runs-on: ubuntu-latest
     needs:
       - lint-chart
-      - kubeval-chart
+      - kubeconform-chart
     strategy:
       matrix:
         k8s:
-          - v1.17.11
-          - v1.18.8
-          - v1.19.4
+          - v1.25.3
+          - v1.24.7
+          - v1.23.13
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
 
       - name: Create kind ${{ matrix.k8s }} cluster
-        uses: helm/kind-action@v1.1.0
+        uses: helm/kind-action@v1.4.0
         with:
           node_image: kindest/node:${{ matrix.k8s }}
 
-      - name: Run chart-testing (install)
-        uses: helm/chart-testing-action@v2.0.1
+      - uses: actions/setup-python@v4
         with:
-          command: install
-          config: .github/ct-install.yaml
+          python-version: "3.9"
+          check-latest: true
+
+      - name: Set up chart-testing
+        uses: helm/chart-testing-action@v2.3.1
+
+      - name: Run chart-testing (install)
+        run: ct install --config .github/ct-install.yaml

Makefile

@@ -1,58 +0,0 @@
-ifndef TAG
-$(error The TAG variable is missing.)
-endif
-
-# Docker Hub namespace
-HUB_NAMESPACE="invoiceninja"
-
-# Image name
-IMAGE="invoiceninja"
-
-# Check if v5 tag is passed, so that a v5 version should be built
-IS_V5=$(shell echo ${TAG} | egrep ^5)
-
-# Version of Invoice Ninja. As the tag can be something like 5.0.4-p1, the version is 5.0.4.
-# This supports changes to the Dockerfiles with always the same Invoice Ninja version
-VERSION=$(shell echo ${TAG} | sed "s/-.*//")
-
-# Building docker images based on alpine.
-# Assigned tags:
-#   - :alpine
-#   - :alpine-<RELEASE VERSION>
-.PHONY: build-alpine
-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} ./alpine/4/
-	# Tag as alpine-4
-	@docker tag ${HUB_NAMESPACE}/${IMAGE}:alpine-${VERSION} ${HUB_NAMESPACE}/${IMAGE}:alpine-4
-	$(info Make: Done.)
-endif
-
-.PHONY: push-alpine
-push-alpine:
-ifeq ($(IS_V5),)
-	$(info Make: Pushing tagged images from alpine.)
-	@docker push ${HUB_NAMESPACE}/${IMAGE}:alpine-${VERSION}
-	@docker push ${HUB_NAMESPACE}/${IMAGE}:alpine-4
-	$(info Make: Done.)
-endif
-
-.PHONY: build-alpine-v5
-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} ./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.)
-endif
-
-.PHONY: push-alpine-v5
-push-alpine-v5:
-ifneq ($(IS_V5),)
-	$(info Make: Pushing tagged images from alpine.)
-	@docker push ${HUB_NAMESPACE}/${IMAGE}:${VERSION}
-	@docker push ${HUB_NAMESPACE}/${IMAGE}:5
-	@docker push ${HUB_NAMESPACE}/${IMAGE}:latest
-endif

README.md

@@ -1,103 +1,94 @@
-![Docker images](https://github.com/invoiceninja/dockerfiles/workflows/Docker%20images/badge.svg)
-[![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)
-[![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/invoiceninja)](https://artifacthub.io/packages/search?repo=invoiceninja)
+[![Docker Image Size](https://img.shields.io/docker/image-size/invoiceninja/invoiceninja-debian?label=debian)](https://hub.docker.com/r/invoiceninja/invoiceninja-debian)
+[![Docker Pulls](https://img.shields.io/docker/pulls/invoiceninja/invoiceninja-debian)](https://hub.docker.com/r/invoiceninja/invoiceninja-debian)
+[![Publish Status](https://github.com/invoiceninja/dockerfiles/actions/workflows/publish-image-debian.yaml/badge.svg)](https://github.com/invoiceninja/dockerfiles/actions/workflows/publish-image-debian.yaml)
+[![Build Status](https://github.com/invoiceninja/dockerfiles/actions/workflows/build-image-debian.yaml/badge.svg)](https://github.com/invoiceninja/dockerfiles/actions/workflows/build-image-debian.yaml)
 
+# Debian Docker for [Invoice Ninja](https://www.invoiceninja.com/)
 
-# Docker for [Invoice Ninja](https://www.invoiceninja.com/)
+👑 **Features**
 
-:crown: **Features**
+NGINX webserver support [NGINX](https://nginx.org/)  
+Built-in Chrome for PDF generation and other features  
+Saxon XLST 2 engine  
+OPcache  
+Multi language support  
 
-:lock: Automatic HTTPS (:heart: [Caddy](https://caddyserver.com/))  
-:fire: NGINX webserver support [NGINX](https://nginx.org/)  
-:hammer: Fully production-ready through Helm Chart  
-:pencil: Adjustable to your needs via environment variable  
+## Get started with Docker Compose
 
-## Get some Kubernetes + Helm with that!
-
-Introducing our very own [Helm Chart](https://github.com/invoiceninja/dockerfiles/tree/master/charts/invoiceninja) that helps you launch a simple standalone app to a production-ready, highly available Invoice Ninja setup. All you need to do is initialise Kubernetes (available with Docker Desktop), install [Helm](https://helm.sh/docs/intro/install/), and spin up Invoice Ninja using the steps provided [here](https://github.com/invoiceninja/dockerfiles/tree/master/charts/invoiceninja#installing-the-chart).
-
-Other resources:
-
-[Helm Chart](https://github.com/Saddamus/invoiceninja-helm) by @Saddamus  
-[K8s Manifest](https://github.com/invoiceninja/dockerfiles/issues/94) by @spacepluk
-
-## Alternatively get started with Docker Compose
-
-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.
+This Debian-based image includes Chrome for enhanced PDF generation and other features. To get started:
 
 ```bash
-git clone https://github.com/invoiceninja/dockerfiles.git
-cd dockerfiles
+git clone https://github.com/invoiceninja/dockerfiles.git -b debian
+cd dockerfiles/debian
 ```
 
-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`, `APP_KEY` and update the rest of the variables as required.
 
 ```
 APP_URL=http://in.localhost:8003/
 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
+REQUIRE_HTTPS=false
+IN_USER_EMAIL=
+IN_PASSWORD=
 ```
 
-The `APP_KEY` can be generated by running
+## Initial account setup
+
+### Primary account setup
+Prior to starting the container for the first time, open the .env file and update the IN_USER_EMAIL and IN_PASSWORD variables with your primary account. 
+
+This will take care of the initial account setup. You can later remove these .env variables.
+
+> ⚠️ **Warning**  
+> If `IN_USER_EMAIL` and `IN_PASSWORD` are not set the default user email and password is "admin@example.com" and "changeme!" respectively. 
+
+After the container has completed the first startup you can delete these two environment variables.
+
+### Generate a APP_KEY
+
+The `APP_KEY` can be generated by running:
 
 ```bash
-docker run --rm -it invoiceninja/invoiceninja php artisan key:generate --show
+# If you haven't started the containers yet:
+docker run --rm -it invoiceninja/invoiceninja-debian php artisan key:generate --show
+
+# Or if your containers are already running:
+docker compose exec app 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.
+**Note: For PDF generation using localhost, your domain name MUST end in .test for PDFs to generate correctly due to Chrome's DNS resolver.
 
-From the terminal run
+Start the container with:
 
 ```bash
-chmod 755 docker/app/public
-sudo chown -R 1500:1500 docker/app
+docker compose up -d
 ```
 
-### Note for people running the container locally on their PC ###
+**Note: When performing the setup, the Database host is ```mysql```
 
-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```
+### Updating the Image
 
-For example, lets say your APP_URL is ```http://in5.test:8000``` and your LAN IP is 192.168.0.124 the hosts file will have an entry looking like this:
-
-
-```192.168.0.124 in5.test```
-
-**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
-
-
-``` docker-compose up -d```
-
-
-**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
+To upgrade to a newer release image, update your docker-compose.yml first by running:
 
 ```bash
-git pull
+docker compose pull
+docker compose up -d
 ```
 
-You may need to manually merge any changes that cannot be merged automatically by git.
+It is recommended to perform a backup before updating.
 
-## Support
+### 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/)
+If you discover a bug, please create an issue. For general queries, visit our [Forum](https://forum.invoiceninja.com/)
+
+
+### Todo
+
+This is a new image which should provide much better support for all users, however there are some items left to complete
+
+- [ ] Backup script  
+- [ ] Integrate soketi server  
+- [ ] Add elastic search for site wide search  

alpine/4/Dockerfile

@@ -1,73 +0,0 @@
-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 as prod
-
-LABEL maintainer="David Bomba <turbo124@gmail.com>"
-
-#####
-# SYSTEM REQUIREMENT
-#####
-ARG INVOICENINJA_VERSION
-ARG BAK_STORAGE_PATH
-ARG BAK_PUBLIC_PATH
-
-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/
-
-RUN install-php-extensions \
-    gd \
-    gmp \
-    opcache \
-    pdo_mysql \
-    zip
-
-# Separate user
-ENV INVOICENINJA_USER=invoiceninja
-
-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" \
-    && 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/ \
-    && mv /tmp/ninja/* /var/www/app \
-    && rm -rf /tmp/ninja* \
-    && mv /var/www/app/storage $BAK_STORAGE_PATH  \
-    && mv /var/www/app/public $BAK_PUBLIC_PATH  \
-    && mkdir -p /var/www/app/public/logo /var/www/app/storage \
-    && chmod -R 755 /var/www/app/storage  \
-    && 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 ''
-
-# Use to be mounted into nginx
-VOLUME /var/www/app/public
-
-ENTRYPOINT ["docker-entrypoint"]
-CMD ["php-fpm"]

alpine/4/rootfs/etc/php/conf.d/in-php.ini

@@ -1,17 +0,0 @@
-; 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

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

@@ -1,110 +0,0 @@
-#!/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"
-
-# Set permission for web server to create/update files (only <v4)
-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'
-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/4/rootfs/usr/local/bin/laravel-init.sh

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

alpine/5/Dockerfile

@@ -1,99 +0,0 @@
-ARG PHP_VERSION=7.4
-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 --platform=$BUILDPLATFORM node:lts-alpine as build
-ARG INVOICENINJA_VERSION
-ARG BAK_STORAGE_PATH
-ARG BAK_PUBLIC_PATH
-
-# Download Invoice Ninja
-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 \
-    && rm -rf /var/www/app/docs /var/www/app/tests
-
-WORKDIR /var/www/app/
-
-# Install node packages
-RUN npm install --production \
-    && npm run production \
-    && rm -rf node_modules \
-    && mv /var/www/app/storage $BAK_STORAGE_PATH \
-    && mv /var/www/app/public $BAK_PUBLIC_PATH  
-
-# Prepare php image
-FROM php:${PHP_VERSION}-fpm-alpine as prod
-ARG INVOICENINJA_VERSION
-ARG BAK_STORAGE_PATH
-ARG BAK_PUBLIC_PATH
-
-LABEL maintainer="David Bomba <turbo124@gmail.com>"
-
-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 /usr/bin/install-php-extensions /usr/local/bin/
-
-RUN install-php-extensions \
-    bcmath \
-    exif \
-    gd \
-    gmp \
-    mysqli \
-    opcache \
-    pdo_mysql \
-    zip \
-    @composer \
-    && rm /usr/local/bin/install-php-extensions
-
-# Install chromium
-RUN set -eux; \
-    apk add --no-cache \
-    supervisor \
-    mysql-client \
-    git \
-    chromium \
-    ttf-freefont
-
-# Copy files
-COPY rootfs /
-
-## Create user
-ARG UID=1500
-ENV INVOICENINJA_USER invoiceninja
-
-RUN addgroup --gid=$UID -S "$INVOICENINJA_USER" \
-    && adduser --uid=$UID \
-    --disabled-password \
-    --gecos "" \
-    --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
-ENV APP_ENV production
-ENV LOG errorlog
-ENV SNAPPDF_EXECUTABLE_PATH /usr/bin/chromium-browser
-
-ENTRYPOINT ["docker-entrypoint"]
-CMD ["supervisord"]

alpine/5/rootfs/etc/supervisord.conf

@@ -1,42 +0,0 @@
-[supervisord]
-nodaemon=true
-pidfile=/tmp/supervisord.pid
-logfile=/dev/null ; nodaemon will cause logs to go to stdout
-logfile_maxbytes=0
-loglevel=info
-
-[program:php-fpm]
-redirect_stderr=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
-command=php-fpm
-
-[program:scheduler]
-autorestart=true
-redirect_stderr=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
-command=php artisan schedule:work
-
-[program:queue-worker]
-process_name=%(program_name)s_%(process_num)02d
-autorestart=true
-redirect_stderr=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
-numprocs=2
-command=php artisan queue:work --sleep=3 --tries=1 --memory=256 --timeout=3600
-
-[eventlistener:shutdown]
-command=shutdown.sh
-events=PROCESS_STATE_STOPPED, PROCESS_STATE_EXITED, PROCESS_STATE_FATAL
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0

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

@@ -1,107 +0,0 @@
-#!/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

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

alpine/5/rootfs/usr/local/bin/shutdown.sh

@@ -1,8 +0,0 @@
-#!/bin/sh
-
-printf "READY\n"
-
-while read line; do
-    echo "Processing Event: $line" >&2
-    kill -SIGQUIT $PPID
-done </dev/stdin

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

@@ -1,17 +0,0 @@
-; 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

charts/invoiceninja/.helmignore

@@ -1,23 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*.orig
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/

charts/invoiceninja/Chart.lock

@@ -1,15 +0,0 @@
-dependencies:
-- name: common
-  repository: https://charts.bitnami.com/bitnami
-  version: 1.4.2
-- name: nginx
-  repository: https://charts.bitnami.com/bitnami
-  version: 8.8.1
-- name: mariadb
-  repository: https://charts.bitnami.com/bitnami
-  version: 9.3.6
-- name: redis
-  repository: https://charts.bitnami.com/bitnami
-  version: 12.9.2
-digest: sha256:fd3577637e412f553b3300f0c174ea7282073e0971da621d2f5c0e43b8f2fdfc
-generated: "2021-04-07T20:59:19.568334+08:00"

charts/invoiceninja/Chart.yaml

@@ -1,46 +0,0 @@
-apiVersion: v2
-name: invoiceninja
-description: A Helm chart to install Invoiceninja
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
-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.3.1
-# 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.35
-keywords:
-  - invoiceninja
-home: https://github.com/lwj5/invoiceninja-chart
-sources:
-  - https://github.com/invoiceninja/invoiceninja
-  - https://github.com/invoiceninja/dockerfiles
-dependencies:
-  - name: common
-    repository: https://charts.bitnami.com/bitnami
-    tags:
-      - bitnami-common
-    version: 1.x.x
-  - name: nginx
-    repository: https://charts.bitnami.com/bitnami
-    version: 8.8.x
-  - condition: mariadb.enabled
-    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

charts/invoiceninja/README.md

@@ -1,233 +0,0 @@
-# Invoiceninja
-
-This helm chart installs a Invoiceninja and its dependencies into a running
-Kubernetes cluster.
-
-The chart installs the [Invoiceninja](https://hub.docker.com/r/invoiceninja/invoiceninja) docker image.
-
-Please read [Upgrading](#upgrading) section before upgrading MAJOR versions.
-
-## Dependencies
-
-- The Bitnami [common](https://github.com/bitnami/charts/tree/master/bitnami/common) helm chart
-- The Bitnami [mariadb](https://github.com/bitnami/charts/tree/master/bitnami/mariadb) helm chart
-- The Bitnami [nginx](https://github.com/bitnami/charts/tree/master/bitnami/nginx) helm chart
-- The Bitnami [redis](https://github.com/bitnami/charts/tree/master/bitnami/redis) helm chart
-- Tested on Kubernetes 1.17+
-
-## Installing the Chart
-
-To install the chart with the release name `invoiceninja`:
-
-```bash
-helm repo add invoiceninja https://invoiceninja.github.io/dockerfiles
-helm install invoiceninja invoiceninja/invoiceninja
-```
-
-The command deploys Invoiceninja on the Kubernetes cluster in the default namespace. The [Parameters](#parameters) section lists the parameters that can be configured during installation.
-
-> **Tip**: List all releases using `helm list`
-
-## Uninstalling the Chart
-
-To uninstall/delete the `invoiceninja` deployment:
-
-```bash
-helm delete invoiceninja
-```
-
-The command removes all the Kubernetes components associated with the chart and deletes the release.
-
-## Parameters
-
-The following table lists the configurable parameters of the Invoiceninja chart and their default values.
-
-> NOTE: You MUST set any values that default to random or risk losing access after an upgrade. See how [here](https://github.com/lwj5/dockerfiles/tree/redis-pw/charts/invoiceninja#installing-with-arguments)
-
-### Global Configuration
-
-The following table shows the configuration options for the Invoiceninja helm chart:
-
-### Global parameters
-
-| Parameter                 | Description                                     | Default                                                 |
-| ------------------------- | ----------------------------------------------- | ------------------------------------------------------- |
-| `global.imageRegistry`    | Global Docker image registry                    | `nil`                                                   |
-| `global.imagePullSecrets` | Global Docker registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) |
-| `global.storageClass`     | Global storage class for dynamic provisioning   | `nil`                                                   |
-
-### Common parameters
-
-| Parameter           | Description                                                          | Default                        |
-| ------------------- | -------------------------------------------------------------------- | ------------------------------ |
-| `nameOverride`      | String to partially override common.names.fullname                   | `nil`                          |
-| `fullnameOverride`  | String to fully override common.names.fullname                       | `nil`                          |
-| `clusterDomain`     | Default Kubernetes cluster domain                                    | `cluster.local`                |
-| `commonLabels`      | Labels to add to all deployed objects                                | `{}`                           |
-| `commonAnnotations` | Annotations to add to all deployed objects                           | `{}`                           |
-| `kubeVersion`       | Force target Kubernetes version (using Helm capabilities if not set) | `nil`                          |
-| `extraDeploy`       | Array of extra objects to deploy with the release                    | `[]` (evaluated as a template) |
-
-### Invoiceninja parameters
-
-| Parameter            | Description                                                     | Default                                                 |
-| -------------------- | --------------------------------------------------------------- | ------------------------------------------------------- |
-| `image.registry`     | Invoiceninja image registry                                     | `docker.io`                                             |
-| `image.repository`   | Invoiceninja image name                                         | `invoiceninja/invoiceninja`                             |
-| `image.tag`          | Invoiceninja image tag                                          | Check `values.yaml` file                                |
-| `image.pullPolicy`   | Invoiceninja image pull policy                                  | `IfNotPresent`                                          |
-| `image.pullSecrets`  | Specify docker-registry secret names as an array                | `[]` (does not add image pull secrets to deployed pods) |
-| `image.debug`        | Specify if debug logs should be enabled                         | `false`                                                 |
-| `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`                                                   |
-
-### Invoiceninja deployment parameters
-
-| Parameter                   | Description                                                                               | Default                        |
-| --------------------------- | ----------------------------------------------------------------------------------------- | ------------------------------ |
-| `replicaCount`              | Number of Invoiceninja Pods to run                                                        | `1`                            |
-| `containerPorts.fastcgi`    | FastCGI port to expose at container level                                                 | `9000`                         |
-| `podSecurityContext`        | Invoiceninja pods' Security Context                                                       | Check `values.yaml` file       |
-| `containerSecurityContext`  | Invoiceninja containers' Security Context                                                 | Check `values.yaml` file       |
-| `resources`                 | The resources for the Invoiceninja container                                              | `{}`                           |
-| `livenessProbe`             | Liveness probe configuration for Invoiceninja                                             | Check `values.yaml` file       |
-| `readinessProbe`            | Readiness probe configuration for Invoiceninja                                            | Check `values.yaml` file       |
-| `updateStrategy`            | Set up update strategy                                                                    | `RollingUpdate`                |
-| `podAntiAffinityPreset`     | Pod anti-affinity preset. Ignored if `affinity` is set. Allowed values: `soft` or `hard`  | `soft`                         |
-| `nodeAffinityPreset.type`   | Node affinity preset type. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `""`                           |
-| `nodeAffinityPreset.key`    | Node label key to match. Ignored if `affinity` is set.                                    | `""`                           |
-| `nodeAffinityPreset.values` | Node label values to match. Ignored if `affinity` is set.                                 | `[]`                           |
-| `affinity`                  | Affinity for pod assignment                                                               | `{}` (evaluated as a template) |
-| `nodeSelector`              | Node labels for pod assignment                                                            | `{}` (evaluated as a template) |
-| `tolerations`               | Tolerations for pod assignment                                                            | `[]` (evaluated as a template) |
-| `podLabels`                 | Extra labels for Invoiceninja pods                                                        | `{}`                           |
-| `podAnnotations`            | Annotations for Invoiceninja pods                                                         | `{}`                           |
-| `extraVolumeMounts`         | Additional volume mounts                                                                  | `[]`                           |
-| `extraVolumes`              | Additional volumes                                                                        | `[]`                           |
-
-### Exposure parameters
-
-| Parameter                          | Description                                                                | Default                        |
-| ---------------------------------- | -------------------------------------------------------------------------- | ------------------------------ |
-| `service.type`                     | Kubernetes Service type                                                    | `ClusterIP`                    |
-| `service.port`                     | Service FastCGI port                                                       | `9000`                         |
-| `service.nodePort`                 | Kubernetes FastCGI node port                                               | `""`                           |
-| `service.clusterIP`                | Invoiceninja service clusterIP IP                                          | `None`                         |
-| `service.loadBalancerSourceRanges` | Restricts access for LoadBalancer (only with `service.type: LoadBalancer`) | `[]`                           |
-| `service.loadBalancerIP`           | loadBalancerIP if service type is `LoadBalancer`                           | `nil`                          |
-| `service.externalTrafficPolicy`    | Enable client source IP preservation                                       | `Cluster`                      |
-| `service.annotations`              | Service annotations                                                        | `{}` (evaluated as a template) |
-
-### Ingress parameters 
-
-| Parameter                                               | Description                           | Default                  |
-| ------------------------------------------------------- | ------------------------------------- | ------------------------ |
-| `nginx.service.type`                                    | Kubernetes Service type               | `ClusterIP`              |
-| `nginx.ingress.enabled`                                 | Enable ingress controller resource    | `true`                   |
-| `nginx.ingress.hostname`                                | Default host for the ingress resource | `invoiceninja.local`     |
-| `nginx.serverBlock`                                     | Custom NGINX server block             | `nil`                    |
-| `nginx.extraVolumes`                                    | Array to add extra volumes            | Check `values.yaml` file |
-| `nginx.extraVolumes[0].persistentVolumeClaim.claimName` | Name of Invoiceninja public PVC       | `invoiceninja-public`    |
-| `nginx.extraVolumeMounts`                               | Array to add extra mount              | Check `values.yaml` file |
-
-> See [Dependencies](#dependencies) for more.
-
-### Persistence parameters
-
-| Parameter                           | Description                              | Default           |
-| ----------------------------------- | ---------------------------------------- | ----------------- |
-| `persistence.public.enabled`        | Enable persistence using PVC             | `true`            |
-| `persistence.public.existingClaim`  | Enable persistence using an existing PVC | `nil`             |
-| `persistence.public.storageClass`   | PVC Storage Class                        | `nil`             |
-| `persistence.public.accessModes`    | PVC Access Modes                         | `[ReadWriteMany]` |
-| `persistence.public.size`           | PVC Storage Request                      | `1Gi`             |
-| `persistence.public.dataSource`     | PVC data source                          | `{}`              |
-| `persistence.storage.enabled`       | Enable persistence using PVC             | `true`            |
-| `persistence.storage.existingClaim` | Enable persistence using an existing PVC | `nil`             |
-| `persistence.storage.storageClass`  | PVC Storage Class                        | `nil`             |
-| `persistence.storage.accessModes`   | PVC Access Modes                         | `[ReadWriteMany]` |
-| `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                               | _random 10 character alphanumeric string_ |
-| `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_ |
-| `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.
-
-### Other parameters
-
-| Parameter                  | Description                             | Default |
-| -------------------------- | --------------------------------------- | ------- |
-| `autoscaling.enabled`      | Enable autoscaling for Invoiceninja     | `false` |
-| `autoscaling.minReplicas`  | Minimum number of Invoiceninja replicas | `1`     |
-| `autoscaling.maxReplicas`  | Maximum number of Invoiceninja replicas | `11`    |
-| `autoscaling.targetCPU`    | Target CPU utilization percentage       | `nil`   |
-| `autoscaling.targetMemory` | Target Memory utilization percentage    | `nil`   |
-
-## Installing with Arguments
-
-Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
-
-```bash
-helm install invoiceninja \
-  --set appKey=changeit \
-  --set replicaCount=3 \
-  --set nginx.replicaCount=3 \
-  --set redis.cluster.slaveCount=3 \
-  --set redis.password=changeit \
-  --set mariadb.auth.rootPassword=changeit \
-  --set mariadb.auth.password=changeit \
-  invoiceninja/invoiceninja
-```
-
-The above command sets the number of replicas to 3 for a highly available (HA) setup. Note that you would need to use an external DB such as MariaDB Galera for a full HA production setup.
-
-Alternatively, a YAML file that specifies the values for the parameters can be provided while [installing](https://helm.sh/docs/helm/helm_install/) the chart. For example,
-
-```bash
-helm install invoiceninja -f values.yaml invoiceninja/invoiceninja
-```
-
-## Upgrading
-
-Nothing yet.

charts/invoiceninja/templates/NOTES.txt

@@ -1,33 +0,0 @@
-
-** Please be patient while the chart is being deployed **
-
-Your controller can be accessed through the following DNS name from within your cluster:
-
-    http://{{ include "invoiceninja.nginx.fullname" . }}.{{ .Release.Namespace }}.svc
-
-To access your controller from outside the cluster follow the steps below:
-
-{{- if or .Values.nginx.ingress.enabled }}
-
-Externally through the following DNS name:
-
-    http://{{ .Values.nginx.ingress.hostname }}
-
--- OR --
-{{ end }}
-
-{{- if contains "NodePort" .Values.nginx.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "invoiceninja.nginx.fullname" . }})
-  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-  echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.nginx.service.type }}
-     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "invoiceninja.nginx.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "invoiceninja.nginx.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
-  echo http://$SERVICE_IP:{{ .Values.service.port }}
-{{- else if contains "ClusterIP" .Values.nginx.service.type }}
-  export SVC_NAME=$(kubectl get svc --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name=nginx,app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-  export SVC_PORT=$(kubectl get svc --namespace {{ .Release.Namespace }} $SVC_NAME -o jsonpath="{.spec.ports[0].port}")
-  echo "Visit http://127.0.0.1:8080 to use your application"
-  kubectl -n {{ .Release.Namespace }} port-forward svc/$SVC_NAME 8080:$SVC_PORT
-{{- end }}

charts/invoiceninja/templates/_helpers.tpl

@@ -1,243 +0,0 @@
-{{/*
-Return the proper image name
-*/}}
-{{- define "invoiceninja.image" -}}
-{{- include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global) -}}
-{{- end -}}
-
-{{/*
-Return the proper Docker Image Registry Secret Names
-*/}}
-{{- define "invoiceninja.imagePullSecrets" -}}
-{{- include "common.images.pullSecrets" (dict "images" (list .Values.image ) "global" .Values.global) -}}
-{{- 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.mariadb.fullname" -}}
-{{- printf "%s-%s" .Release.Name "mariadb" | 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.nginx.fullname" -}}
-{{- 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
-*/}}
-{{- define "invoiceninja.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "common.names.fullname" .) .Values.serviceAccount.name }}
-{{- else -}}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Return the proper Storage Class
-*/}}
-{{- define "invoiceninja.public.storageClass" -}}
-{{- include "common.storage.class" (dict "persistence" .Values.persistence "global" .Values.global) -}}
-{{- end -}}
-
-{{/*
-Return the proper Storage Class
-*/}}
-{{- define "invoiceninja.storage.storageClass" -}}
-{{- include "common.storage.class" (dict "persistence" .Values.persistence "global" .Values.global) -}}
-{{- end -}}
-
-{{/*
-Return the proper Storage Name
-*/}}
-{{- define "invoiceninja.public.storageName" -}}
-{{- printf "%s-%s" .Release.Name "public" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Return the proper Storage Name
-*/}}
-{{- define "invoiceninja.storage.storageName" -}}
-{{- printf "%s-%s" .Release.Name "storage" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Return the MariaDB Hostname
-*/}}
-{{- define "invoiceninja.databaseHost" -}}
-{{- if .Values.mariadb.enabled }}
-    {{- if eq .Values.mariadb.architecture "replication" }}
-        {{- printf "%s-%s" (include "invoiceninja.mariadb.fullname" .) "primary" | trunc 63 | trimSuffix "-" -}}
-    {{- else -}}
-        {{- printf "%s" (include "invoiceninja.mariadb.fullname" .) -}}
-    {{- end -}}
-{{- else -}}
-    {{- printf "%s" .Values.externalDatabase.host -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Return the MariaDB Port
-*/}}
-{{- define "invoiceninja.databasePort" -}}
-{{- if .Values.mariadb.enabled }}
-    {{- printf "3306" -}}
-{{- else -}}
-    {{- printf "%d" (.Values.externalDatabase.port | int ) -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Return the MariaDB Database Name
-*/}}
-{{- define "invoiceninja.databaseName" -}}
-{{- if .Values.mariadb.enabled }}
-    {{- printf "%s" .Values.mariadb.auth.database -}}
-{{- else -}}
-    {{- printf "%s" .Values.externalDatabase.database -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Return the MariaDB User
-*/}}
-{{- define "invoiceninja.databaseUser" -}}
-{{- if .Values.mariadb.enabled }}
-    {{- printf "%s" .Values.mariadb.auth.username -}}
-{{- else -}}
-    {{- printf "%s" .Values.externalDatabase.user -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Return the MariaDB Secret Name
-*/}}
-{{- define "invoiceninja.databaseSecretName" -}}
-{{- if .Values.externalDatabase.existingSecret -}}
-    {{- printf "%s" .Values.externalDatabase.existingSecret -}}
-{{- else -}}
-    {{- 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 Queue Connection 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 -}}
-
-{{/*
-Return the Session Connection Name
-*/}}
-{{- define "invoiceninja.redisSessionConnection" -}}
-{{- 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 -}}

charts/invoiceninja/templates/configmap.yaml

@@ -1,58 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.names.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 }}
-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 }}
-  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 }}
-  SESSION_CONNECTION: {{ include "invoiceninja.redisSessionConnection" . | quote }}

charts/invoiceninja/templates/deployment.yaml

@@ -1,173 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "common.names.fullname" . }}
-  labels:
-    {{- include "common.labels.standard" $ | nindent 4 }}
-    app.kubernetes.io/component: server
-    {{- 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 }}
-spec:
-  {{- if not .Values.autoscaling.enabled }}
-  replicas: {{ .Values.replicaCount }}
-  {{- end }}
-  {{- if .Values.updateStrategy }}
-  strategy: {{- toYaml .Values.updateStrategy | nindent 4 }}
-  {{- end }}
-  selector:
-    matchLabels:
-      {{- include "common.labels.matchLabels" $ | nindent 6 }}
-      app.kubernetes.io/component: server
-  template:
-    metadata:
-      {{- if .Values.podAnnotations }}
-      annotations:
-        {{- include "common.tplvalues.render" (dict "value" .Values.podAnnotations "context" $) | nindent 8 }}
-      {{- end }}
-      labels:
-        {{- include "common.labels.standard" $ | nindent 8 }}
-        app.kubernetes.io/component: server
-        {{- if .Values.podLabels }}
-        {{- include "common.tplvalues.render" (dict "value" .Values.podLabels "context" $) | nindent 8 }}
-        {{- end }}
-    spec:
-      {{- include "invoiceninja.imagePullSecrets" . | nindent 6 }}
-      serviceAccountName: {{ include "invoiceninja.serviceAccountName" . }}
-      {{- if .Values.affinity }}
-      affinity: {{- include "common.tplvalues.render" (dict "value" .Values.affinity "context" $) | nindent 8 }}
-      {{- else }}
-      affinity:
-        podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.podAffinityPreset "context" $) | nindent 10 }}
-        podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.podAntiAffinityPreset "context" $) | nindent 10 }}
-        nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.nodeAffinityPreset.type "key" .Values.nodeAffinityPreset.key "values" .Values.nodeAffinityPreset.values) | nindent 10 }}
-      {{- end }}
-      {{- if .Values.nodeSelector }}
-      nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.nodeSelector "context" $) | nindent 8 }}
-      {{- end }}
-      {{- if .Values.tolerations }}
-      tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.tolerations "context" $) | nindent 8 }}
-      {{- 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:
-            {{- toYaml .Values.containerSecurityContext | nindent 12 }}
-          image: {{ include "invoiceninja.image" . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          ports:
-            - name: fastcgi
-              containerPort: {{ .Values.containerPorts.fastcgi }}
-              protocol: TCP
-          {{- if .Values.livenessProbe.enabled }}
-          livenessProbe:
-            initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
-            periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
-            timeoutSeconds: {{ $.Values.livenessProbe.timeoutSeconds }}
-            successThreshold: {{ $.Values.livenessProbe.successThreshold }}
-            failureThreshold: {{ $.Values.livenessProbe.failureThreshold }}
-            tcpSocket:
-              port: {{ .Values.livenessProbe.port }}
-          {{- end }}
-          {{- if .Values.readinessProbe.enabled }}
-          readinessProbe:
-            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
-            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
-            timeoutSeconds: {{ $.Values.readinessProbe.timeoutSeconds }}
-            successThreshold: {{ $.Values.readinessProbe.successThreshold }}
-            failureThreshold: {{ $.Values.readinessProbe.failureThreshold }}
-            tcpSocket:
-              port: {{ .Values.readinessProbe.port }}
-          {{- end }}
-          envFrom:
-            - configMapRef:
-                name: {{ include "common.names.fullname" . }}
-            - secretRef:
-                name: {{ include "common.names.fullname" . }}
-            {{- if .Values.extraEnvVarsCM }}
-            - configMapRef:
-                name: {{ include "common.tplvalues.render" (dict "value" .Values.extraEnvVarsCM "context" $) }}
-            {{- end }}
-            {{- if .Values.extraEnvVarsSecret }}
-            - secretRef:
-                name: {{ include "common.tplvalues.render" (dict "value" .Values.extraEnvVarsSecret "context" $) }}
-            {{- end }}
-          env:
-            - name: DB_PASSWORD1
-              valueFrom:
-                secretKeyRef:
-                  name: {{ include "invoiceninja.databaseSecretName" . }}
-                  key: mariadb-password
-            {{- if or (and .Values.redis.enabled .Values.redis.usePassword) (or .Values.externalRedis.password .Values.externalRedis.existingSecret) }}
-            - 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 }}
-          resources:
-            {{- toYaml .Values.resources | nindent 12 }}
-          volumeMounts:
-            - mountPath: /var/www/app/public
-              name: public
-            - mountPath: /var/www/app/storage
-              name: storage
-            {{- if .Values.extraVolumeMounts }}
-              {{- include "common.tplvalues.render" (dict "value" .Values.extraVolumeMounts "context" $) | nindent 12 }}
-            {{- end }}
-      volumes:
-        - name: public
-          {{- if .Values.persistence.public.enabled }}
-          persistentVolumeClaim:
-            claimName: {{ .Values.persistence.public.existingClaim | default (include "invoiceninja.public.storageName" .) }}
-          {{- else }}
-          emptyDir: {}
-          {{ end }}
-        - name: storage
-          {{- if .Values.persistence.storage.enabled }}
-          persistentVolumeClaim:
-            claimName: {{ .Values.persistence.storage.existingClaim | default (include "invoiceninja.storage.storageName" .) }}
-          {{- else }}
-          emptyDir: {}
-          {{ end }}
-        {{- if .Values.extraVolumes }}
-          {{- include "common.tplvalues.render" (dict "value" .Values.extraVolumes "context" $) | nindent 8 }}
-        {{- end }}

charts/invoiceninja/templates/hpa.yaml

@@ -1,35 +0,0 @@
-{{- if .Values.autoscaling.enabled }}
-apiVersion: autoscaling/v2beta1
-kind: HorizontalPodAutoscaler
-metadata:
-  name: {{ include "common.names.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 }}
-spec:
-  scaleTargetRef:
-    apiVersion: apps/v1
-    kind: Deployment
-    name: {{ include "common.names.fullname" . }}
-  minReplicas: {{ .Values.autoscaling.minReplicas }}
-  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
-  metrics:
-    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: cpu
-        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
-    {{- end }}
-    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: memory
-        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
-    {{- end }}
-{{- end }}

charts/invoiceninja/templates/pvc.yaml

@@ -1,52 +0,0 @@
-{{- if and .Values.persistence.public.enabled (not .Values.persistence.public.existingClaim) }}
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: {{ include "invoiceninja.public.storageName" . }}
-  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 }}
-spec:
-  accessModes:
-    - {{ .Values.persistence.public.accessMode | quote }}
-  resources:
-    requests:
-      storage: {{ .Values.persistence.public.size | quote }}
-  {{- include "invoiceninja.public.storageClass" . | nindent 2 }}
-  {{- if .Values.persistence.public.dataSource }}
-  dataSource: {{- include "common.tplvalues.render" ( dict "value" .Values.persistence.public.dataSource "context" $ ) | nindent 4 }}
-  {{- end }}
-{{- end }}
-
----
-{{- if and .Values.persistence.storage.enabled (not .Values.persistence.storage.existingClaim) }}
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: {{ include "invoiceninja.storage.storageName" . }}
-  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 }}
-spec:
-  accessModes:
-    - {{ .Values.persistence.storage.accessMode | quote }}
-  resources:
-    requests:
-      storage: {{ .Values.persistence.storage.size | quote }}
-  {{- include "invoiceninja.storage.storageClass" . | nindent 2 }}
-  {{- if .Values.persistence.storage.dataSource }}
-  dataSource: {{- include "common.tplvalues.render" ( dict "value" .Values.persistence.storage.dataSource "context" $ ) | nindent 4 }}
-  {{- end }}
-{{- end }}

charts/invoiceninja/templates/secret.yaml

@@ -1,60 +0,0 @@
-{{- if not (or .Values.mariadb.enabled .Values.externalDatabase.existingSecret) }}
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "invoiceninja.mariadb.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:
-  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
-metadata:
-  name: {{ include "common.names.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:
-  {{- if not (empty .Values.appKey) }}
-  APP_KEY: {{ .Values.appKey | b64enc | quote }}
-  {{- else }}
-  APP_KEY: {{ randAlphaNum 32 | b64enc | quote }}
-  {{- end }}

charts/invoiceninja/templates/service.yaml

@@ -1,47 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "common.names.fullname" . }}
-  labels:
-    {{- include "common.labels.standard" $ | nindent 4 }}
-    {{- if .Values.commonLabels }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
-    {{- end }}
-  {{- if or .Values.service.annotations .Values.commonAnnotations }}
-  annotations:
-    {{- if .Values.service.annotations }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.service.annotations "context" $ ) | nindent 4 }}
-    {{- end }}
-    {{- if .Values.commonAnnotations }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-    {{- end }}
-  {{- end }}
-spec:
-  type: {{ .Values.service.type }}
-  {{- if and .Values.service.clusterIP (eq .Values.service.type "ClusterIP") }}
-  clusterIP: {{ .Values.service.clusterIP }}
-  {{- end }}
-  {{- if (or (eq .Values.service.type "LoadBalancer") (eq .Values.service.type "NodePort")) }}
-  externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy | quote }}
-  {{- end }}
-  {{- if (and (eq .Values.service.type "LoadBalancer") .Values.service.loadBalancerSourceRanges) }}
-  loadBalancerSourceRanges: {{- toYaml . | nindent 4 }}
-  {{- end }}
-  {{- if (and (eq .Values.service.type "LoadBalancer") (not (empty .Values.service.loadBalancerIP))) }}
-  loadBalancerIP: {{ .Values.service.loadBalancerIP }}
-  {{- end }}
-  ports:
-    {{- if not (empty .Values.service.port) }}
-    - name: fastcgi
-      port:  {{ .Values.service.port }}
-      protocol: TCP
-      targetPort: fastcgi
-      {{- if (and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (not (empty .Values.service.nodePort))) }}
-      nodePort: {{ .Values.service.nodePort }}
-      {{- else if eq .Values.service.type "ClusterIP" }}
-      nodePort: null
-      {{- end }}
-    {{- end }}
-  selector:
-    {{- include "common.labels.matchLabels" . | nindent 4 }}
-    app.kubernetes.io/component: server

charts/invoiceninja/templates/serviceaccount.yaml

@@ -1,20 +0,0 @@
-{{- if .Values.serviceAccount.create -}}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "invoiceninja.serviceAccountName" . }}
-  labels:
-    {{- include "common.labels.standard" $ | nindent 4 }}
-    {{- if .Values.commonLabels }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
-    {{- end }}
-  {{- if or .Values.serviceAccount.annotations .Values.commonAnnotations }}
-  annotations:
-    {{- if .Values.serviceAccount.annotations }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.serviceAccount.annotations "context" $ ) | nindent 4 }}
-    {{- end }}
-    {{- if .Values.commonAnnotations }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-    {{- end }}
-  {{- end }}
-{{- end }}

charts/invoiceninja/values.yaml

@@ -1,469 +0,0 @@
-# Default values for invoiceninja.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-## Global Docker image parameters
-## Please, note that this will override the image parameters, including dependencies, configured to use the global value
-## Current available global Docker image parameters: imageRegistry, imagePullSecrets and storageClass
-##
-# global:
-#   imageRegistry: myRegistryName
-#   imagePullSecrets:
-#     - myRegistryKeySecretName
-#   storageClass: myStorageClass
-
-## Invoiceninja image version
-## ref: https://github.com/invoiceninja/dockerfiles
-##
-image:
-  registry: docker.io
-  repository: invoiceninja/invoiceninja
-  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
-  ##
-  pullPolicy: IfNotPresent
-  ## Optionally specify an array of imagePullSecrets.
-  ## Secrets must be manually created in the namespace.
-  ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
-  ##
-  # pullSecrets:
-  #   - myRegistryKeySecretName
-
-## String to turn on debug mode in Invoiceninja
-##
-debug: false
-
-## A 32 character long Application Key
-##
-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:
-
-## String to fully override fullname template
-##
-# fullnameOverride:
-
-## Add labels to all the deployed resources
-##
-commonLabels: {}
-
-## Add annotations to all the deployed resources
-##
-commonAnnotations: {}
-
-serviceAccount:
-  # Specifies whether a service account should be created
-  create: true
-  # Annotations to add to the service account
-  annotations: {}
-  # The name of the service account to use.
-  # If not set and create is true, a name is generated using the fullname template
-  name: ""
-
-## Pod Labels
-## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
-##
-podLabels: {}
-
-## Pod annotations
-## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
-##
-podAnnotations: {}
-
-## Pod affinity preset
-## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity
-## Allowed values: soft, hard
-##
-podAffinityPreset: ""
-
-## Pod anti-affinity preset
-## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity
-## Allowed values: soft, hard
-##
-podAntiAffinityPreset: soft
-
-## Node affinity preset
-## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity
-## Allowed values: soft, hard
-##
-nodeAffinityPreset:
-  ## Node affinity type
-  ## Allowed values: soft, hard
-  ##
-  type: ""
-  ## Node label key to match
-  ## E.g.
-  ## key: "kubernetes.io/e2e-az-name"
-  ##
-  key: ""
-  ## Node label values to match
-  ## E.g.
-  ## values:
-  ##   - e2e-az1
-  ##   - e2e-az2
-  ##
-  values: []
-
-## Affinity for pod assignment. Evaluated as a template.
-## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
-## Note: podAffinityPreset, podAntiAffinityPreset, and nodeAffinityPreset will be ignored when it's set
-##
-affinity: {}
-
-## Node labels for pod assignment. Evaluated as a template.
-## ref: https://kubernetes.io/docs/user-guide/node-selection/
-##
-nodeSelector: {}
-
-## Tolerations for pod assignment. Evaluated as a template.
-## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
-##
-tolerations: []
-
-## Configure Pods Security Context
-## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
-##
-podSecurityContext:
-  fsGroup: 1500
-
-## Configure Container Security Context (only main container)
-## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container
-##
-containerSecurityContext:
-  runAsNonRoot: true
-  runAsUser: 1500
-  # runAsGroup: 1500
-  # capabilities:
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-
-## Number of replicas (requires ReadWriteMany PVC support)
-##
-replicaCount: 1
-
-## Set up update strategy for Invoiceninja installation. Set to Recreate if you use persistent volume that cannot be mounted by more than one pods to makesure the pods is destroyed first.
-## ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy
-## Example:
-## updateStrategy:
-##  type: RollingUpdate
-##  rollingUpdate:
-##    maxSurge: 25%
-##    maxUnavailable: 25%
-##
-updateStrategy:
-  type: RollingUpdate
-
-## Container ports
-##
-containerPorts:
-  fastcgi: 9000
-
-## An array to add extra env vars
-## Example:
-## extraEnvVars:
-##   - name: FOO
-##     value: "bar"
-##
-extraEnvVars: []
-
-## ConfigMap with extra environment variables
-##
-extraEnvVarsCM:
-
-## Secret with extra environment variables
-##
-extraEnvVarsSecret:
-
-## Extra volumes to add to the deployment
-##
-extraVolumes: []
-
-## Extra volume mounts to add to the container
-##
-extraVolumeMounts: []
-
-## Kubernetes service type
-## ref: https://kubernetes.io/docs/concepts/services-networking/service/
-## Set this to NodePort, LoadBalancer or ClusterIP
-##
-service:
-  ## Service type
-  ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types
-  ##
-  type: ClusterIP
-  ## Service ports
-  ##
-  port: 9000
-  ## Specify the nodePort value for the LoadBalancer and NodePort service types.
-  ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport
-  ##
-  nodePort: ""
-  ## Service clusterIP.
-  ##
-  # clusterIP: None
-  ## Specify the loadBalancerIP value for LoadBalancer service types.
-  ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#loadbalancer
-  ##
-  # loadBalancerIP:
-  ## Specify the loadBalancerSourceRanges value for LoadBalancer service types.
-  ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service
-  ##
-  loadBalancerSourceRanges: []
-  ## Enable client source IP preservation
-  ## ref http://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip
-  ##
-  externalTrafficPolicy: Cluster
-  ## Additional service annotations (evaluate as a template)
-  ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
-  ##
-  annotations: {}
-
-## Configure extra options for liveness and readiness probes
-## This applies to all the Invoiceninja in the sharded cluster
-## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes)
-##
-livenessProbe:
-  enabled: true
-  initialDelaySeconds: 30
-  periodSeconds: 10
-  timeoutSeconds: 5
-  failureThreshold: 6
-  successThreshold: 1
-  port: fastcgi
-readinessProbe:
-  enabled: true
-  initialDelaySeconds: 15
-  periodSeconds: 10
-  timeoutSeconds: 5
-  failureThreshold: 6
-  successThreshold: 1
-  port: fastcgi
-
-resources:
-  {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #   cpu: 100m
-  #   memory: 128Mi
-  # requests:
-  #   cpu: 100m
-  #   memory: 128Mi
-
-## Enable persistence using Persistent Volume Claims
-## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/
-##
-persistence:
-  public:
-    enabled: true
-    ## Invoiceninja data Persistent Volume Storage Class
-    ## If defined, storageClassName: <storageClass>
-    ## If set to "-", storageClassName: "", which disables dynamic provisioning
-    ## If undefined (the default) or set to null, no storageClassName spec is
-    ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
-    ##   GKE, AWS & OpenStack)
-    ##
-    # storageClass: "-"
-    ##
-    ## If you want to reuse an existing claim, you can pass the name of the PVC using
-    ## the existingClaim variable
-    # existingClaim: your-claim
-    accessMode: ReadWriteMany
-    size: 1Gi
-    ## Custom dataSource
-    ##
-    dataSource: {}
-  storage:
-    enabled: true
-    ## Invoiceninja data Persistent Volume Storage Class
-    ## If defined, storageClassName: <storageClass>
-    ## If set to "-", storageClassName: "", which disables dynamic provisioning
-    ## If undefined (the default) or set to null, no storageClassName spec is
-    ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
-    ##   GKE, AWS & OpenStack)
-    ##
-    # storageClass: "-"
-    ##
-    ## If you want to reuse an existing claim, you can pass the name of the PVC using
-    ## the existingClaim variable
-    # existingClaim: your-claim
-    accessMode: ReadWriteMany
-    size: 10Gi
-    ## Custom dataSource
-    ##
-    dataSource: {}
-
-autoscaling:
-  enabled: false
-  minReplicas: 1
-  maxReplicas: 10
-  targetCPUUtilizationPercentage: 80
-  # targetMemoryUtilizationPercentage: 80
-
-## Redis chart configuration
-## ref: https://github.com/bitnami/charts/blob/master/bitnami/redis/values.yaml
-##
-redis:
-  enabled: true
-  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
-##
-mariadb:
-  ## Whether to deploy a MariaDB server to satisfy the applications database requirements.
-  ## To use an external database set this to false and configure the externaldb parameters
-  ##
-  enabled: true
-  ## MariaDB Authentication parameters
-  ##
-  auth:
-    ## MariaDB root password
-    ##
-    # rootPassword: changeit
-    ## MariaDB custom user and database
-    ##
-    username: invoiceninja
-    database: invoiceninja
-    # password: changeit
-
-## External Database Configuration
-##
-## All of these values are only used when mariadb.enabled is set to false
-##
-externalDatabase:
-  ## Database host
-  ##
-  host: ""
-  ## non-root Username for Invoiceninja Database
-  ##
-  user: invoiceninja
-  ## Database password
-  ##
-  password: ""
-  ## Database name
-  ##
-  database: invoiceninja
-  ## Database port number
-  ##
-  port: 3306
-  ## Use existing secret (ignores previous password)
-  ## must contain key `mariadb-password`
-  ## NOTE: When it's set, the `externalDatabase.password` parameter is ignored
-  ##
-  # existingSecret:
-
-## Nginx chart configuration
-## ref: https://github.com/bitnami/charts/blob/master/bitnami/nginx/values.yaml
-##
-nginx:
-  service:
-    ## Service type
-    ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types
-    ##
-    type: ClusterIP
-  ## Configure the ingress resource that allows you to access the Invoiceninja
-  ## ref: http://kubernetes.io/docs/user-guide/ingress/
-  ##
-  ingress:
-    enabled: true
-    hostname: invoiceninja.local
-  ## Configure the serverblock for Invoiceninja
-  ## Note: you may need to replace the fastcgi_pass value if the release name is different
-  ##
-  serverBlock: |
-    server {
-        listen 8080 default_server;
-        server_name _;
-
-        root /var/www/app/public/;
-        index index.php;
-
-        location / {
-            try_files $uri $uri/ /index.php?$query_string;
-        }
-
-        location = /favicon.ico { access_log off; log_not_found off; }
-        location = /robots.txt  { access_log off; log_not_found off; }
-
-        location ~ \.php$ {
-            fastcgi_split_path_info ^(.+\.php)(/.+)$;
-            fastcgi_pass invoiceninja:9000;
-            fastcgi_index index.php;
-            include fastcgi_params;
-            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-            fastcgi_intercept_errors off;
-            fastcgi_buffer_size 16k;
-            fastcgi_buffers 4 16k;
-        }
-    }
-  ## Configure the extraVolumes and extraVolumeMounts for Invoiceninja
-  ## Note: you may need to replace the claimName if the release name is different
-  ##
-  extraVolumes:
-    - name: public
-      persistentVolumeClaim:
-        claimName: invoiceninja-public
-  extraVolumeMounts:
-    - mountPath: /var/www/app/public
-      name: public
-      readOnly: true

config/caddy/Caddyfile

@@ -1,6 +0,0 @@
-{$APP_URL} {
-    root * /var/www/app/public
-    php_fastcgi app:9000
-    encode zstd gzip
-    file_server browse
-}

config/cron/cronjob_v5.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env sh
-
-cd /var/www/app; php artisan schedule:run >> /dev/null 2>&1

config/hosts

@@ -1 +0,0 @@
-192.168.0.124 in5.test

config/mysql/Dockerfile

@@ -1,12 +0,0 @@
-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;
-RUN apt-get install -y cron;
-
-ENTRYPOINT \
-  service cron start; \
-  printenv | grep -v "no_proxy" >> /etc/environment; \
-  docker-entrypoint.sh mysqld

config/mysql/backup-script

@@ -1,28 +0,0 @@
-#!/bin/sh
-
-FREQUENTY=`basename "$0"`
-TIMESTAMP=$(date +"%Y-%m-%d")
-
-case $FREQUENTY in
-
-  daily)
-    DAYS=6
-    ;;
-
-  weekly)
-    DAYS=30
-    find /backups -type f -name $TIMESTAMP-daily.sql.gz -delete
-    ;;
-
-  monthly)
-    DAYS=122
-    find /backups -type f -name $TIMESTAMP-weekly.sql.gz -delete
-    ;;
-esac
-
-mysqldump -u ${MYSQL_USER} -p${MYSQL_PASSWORD} ${MYSQL_DATABASE} | gzip > /backups/$TIMESTAMP-$FREQUENTY.sql.gz
-
-# Remove old backups
-find /backups -mtime +${DAYS} -type f -name *-$FREQUENTY.sql.gz -delete
-
-exit 0;

debian/.env

@@ -0,0 +1,62 @@
+# IN application vars
+APP_URL=http://localhost:8012
+APP_KEY=base64:RR++yx2rJ9kdxbdh3+AmbHLDQu+Q76i++co9Y8ybbno=
+APP_ENV=production
+APP_DEBUG=true
+REQUIRE_HTTPS=false
+PHANTOMJS_PDF_GENERATION=false
+PDF_GENERATOR=snappdf
+TRUSTED_PROXIES='*'
+
+
+CACHE_DRIVER=redis
+QUEUE_CONNECTION=redis
+SESSION_DRIVER=redis
+
+REDIS_HOST=redis
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+FILESYSTEM_DISK=debian_docker
+
+# DB connection
+DB_HOST=mysql
+DB_PORT=3306
+DB_DATABASE=ninja
+DB_USERNAME=ninja
+DB_PASSWORD=ninja
+DB_ROOT_PASSWORD=ninjaAdm1nPassword
+DB_CONNECTION=mysql
+
+# Create initial user
+# Default to these values if empty
+IN_USER_EMAIL=admin@example.com
+IN_PASSWORD=changeme!
+# IN_USER_EMAIL=
+# IN_PASSWORD=
+
+# Mail options
+MAIL_MAILER=log
+MAIL_HOST=smtp.mailtrap.io
+MAIL_PORT=2525
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
+MAIL_FROM_ADDRESS='user@example.com'
+MAIL_FROM_NAME='Self Hosted User'
+
+# MySQL
+MYSQL_ROOT_PASSWORD=ninjaAdm1nPassword
+MYSQL_USER=ninja
+MYSQL_PASSWORD=ninja
+MYSQL_DATABASE=ninja
+
+# GoCardless/Nordigen API key for banking integration
+NORDIGEN_SECRET_ID=
+NORDIGEN_SECRET_KEY=
+
+IS_DOCKER=true
+SCOUT_DRIVER=null
+#SNAPPDF_CHROMIUM_PATH=/usr/bin/google-chrome-stable
+
+

debian/Dockerfile

@@ -0,0 +1,90 @@
+ARG PHP=8.4
+
+FROM php:${PHP}-fpm AS prepare-app
+
+ARG URL=https://github.com/invoiceninja/invoiceninja/releases/latest/download/invoiceninja.tar.gz
+
+ADD ${URL} /tmp/invoiceninja.tar.gz
+
+RUN tar -xzf /tmp/invoiceninja.tar.gz -C /var/www/html \
+    && ln -s /var/www/html/resources/views/react/index.blade.php /var/www/html/public/index.html \
+    && php artisan storage:link \
+    # Workaround for application updates
+    && mv /var/www/html/public /tmp/public
+
+# ==================
+# InvoiceNinja image
+# ==================
+FROM php:${PHP}-fpm
+
+# PHP modules
+ARG php_require="bcmath gd mbstring pdo_mysql zip"
+ARG php_suggest="exif imagick intl pcntl saxon soap"
+ARG php_extra="opcache"
+
+# Install system dependencies
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    libfcgi-bin \
+    mariadb-client \
+    gpg \
+    supervisor \
+    # Unicode support for PDF
+    fonts-noto-cjk-extra \
+    fonts-wqy-microhei \
+    fonts-wqy-zenhei \
+    xfonts-wqy \
+    # Install google-chrome-stable(amd64)/chromium(arm64)
+    && if [ "$(dpkg --print-architecture)" = "amd64" ]; then \
+    mkdir -p /etc/apt/keyrings \
+    && curl -fsSL https://dl.google.com/linux/linux_signing_key.pub | \
+    gpg --dearmor -o /etc/apt/keyrings/google.gpg \
+    && echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/google.gpg] https://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list \
+    && apt-get update \
+    && apt-get install -y --no-install-recommends google-chrome-stable; \
+    elif [ "$(dpkg --print-architecture)" = "arm64" ]; then \
+    apt-get install -y --no-install-recommends \
+    chromium; \
+    fi \
+    # Create config directory for chromium/google-chrome-stable
+    && mkdir /var/www/.config \
+    && chown www-data:www-data /var/www/.config \
+    # Cleanup
+    && apt-get purge -y gpg \
+    && apt-get autoremove -y \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+# Install PHP extensions
+COPY --from=ghcr.io/mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/local/bin/
+
+RUN install-php-extensions \
+    ${php_require} \
+    ${php_suggest} \
+    ${php_extra}
+
+# Configure PHP
+RUN ln -s "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
+
+COPY php/php.ini /usr/local/etc/php/conf.d/invoiceninja.ini
+
+COPY php/php-fpm.conf /usr/local/etc/php-fpm.d/invoiceninja.conf
+
+# Workaround: Disable SSL for mariadb-client for compatibility with MySQL
+RUN echo "skip-ssl = true" >> /etc/mysql/mariadb.conf.d/50-client.cnf
+
+# Setup supervisor
+COPY supervisor/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+
+# Setup InvoiceNinja
+COPY --from=prepare-app --chown=www-data:www-data /var/www/html /var/www/html
+COPY --from=prepare-app --chown=www-data:www-data /tmp/public /tmp/public
+
+# Add initialization script
+COPY --chmod=0755 scripts/init.sh /usr/local/bin/init.sh
+
+# Health check
+HEALTHCHECK --start-period=100s \
+    CMD REMOTE_ADDR=127.0.0.1 REQUEST_URI=/health REQUEST_METHOD=GET SCRIPT_FILENAME=/var/www/html/public/index.php cgi-fcgi -bind -connect 127.0.0.1:9000 | grep '{"status":"ok","message":"API is healthy"}'
+
+ENTRYPOINT ["/usr/local/bin/init.sh"]
+CMD ["supervisord", "-c", "/etc/supervisor/supervisord.conf"]

debian/docker-compose.yml

@@ -0,0 +1,72 @@
+services:
+  app:
+    build:
+      context: .
+    image: invoiceninja/invoiceninja-debian:${TAG:-latest}
+    restart: unless-stopped
+    env_file:
+      - ./.env
+    volumes:
+      # - ./php/php.ini:/usr/local/etc/php/conf.d/invoiceninja.ini:ro
+      # - ./php/php-fpm.conf:/usr/local/etc/php-fpm.d/invoiceninja.conf:ro
+      # - ./supervisor/supervisord.conf:/etc/supervisor/conf.d/supervisord.conf:ro
+      - app_public:/var/www/html/public
+      - app_storage:/var/www/html/storage
+    depends_on:
+      mysql:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
+
+  nginx:
+    image: nginx:alpine
+    restart: unless-stopped
+    ports:
+      - "80:80"
+    volumes:
+      - ./nginx:/etc/nginx/conf.d:ro
+      - app_public:/var/www/html/public:ro
+      - app_storage:/var/www/html/storage:ro
+    depends_on:
+      app:
+        condition: service_healthy
+
+  mysql:
+    image: mysql:8
+    restart: unless-stopped
+    environment:
+      MYSQL_DATABASE: ${DB_DATABASE}
+      MYSQL_USER: ${DB_USERNAME}
+      MYSQL_PASSWORD: ${DB_PASSWORD}
+      MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASSWORD}
+    volumes:
+      - mysql_data:/var/lib/mysql
+    healthcheck:
+      test:
+        [
+          "CMD",
+          "mysqladmin",
+          "ping",
+          "-h",
+          "localhost",
+          "-u${MYSQL_USER}",
+          "-p${MYSQL_PASSWORD}",
+        ]
+
+  redis:
+    image: redis:alpine
+    restart: unless-stopped
+    volumes:
+      - redis_data:/data
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+
+volumes:
+  app_public:
+    driver: local
+  app_storage:
+    driver: local
+  mysql_data:
+    driver: local
+  redis_data:
+    driver: local

debian/nginx/invoiceninja.conf

@@ -0,0 +1,14 @@
+# https://nginx.org/en/docs/http/ngx_http_core_module.html
+client_max_body_size 10M;
+client_body_buffer_size 10M;
+server_tokens off;
+
+# https://nginx.org/en/docs/http/ngx_http_fastcgi_module.html
+fastcgi_buffers 32 16K;
+
+# https://nginx.org/en/docs/http/ngx_http_gzip_module.html
+gzip on;
+gzip_comp_level 2;
+gzip_min_length 1M;
+gzip_proxied any;
+gzip_types *;

debian/nginx/laravel.conf

@@ -1,27 +1,32 @@
+# https://laravel.com/docs/master/deployment#nginx
 server {
     listen 80 default_server;
-    server_name _;
+    server_name _;   
+    root /var/www/html/public;
 
-    client_max_body_size 100M;
+    add_header X-Frame-Options "SAMEORIGIN";
+    add_header X-Content-Type-Options "nosniff";
 
-    root /var/www/app/public/;
     index index.php;
-
+ 
+    charset utf-8;
+ 
     location / {
         try_files $uri $uri/ /index.php?$query_string;
     }
-
+ 
     location = /favicon.ico { access_log off; log_not_found off; }
     location = /robots.txt  { access_log off; log_not_found off; }
+ 
+    error_page 404 /index.php;
 
     location ~ \.php$ {
-        fastcgi_split_path_info ^(.+\.php)(/.+)$;
         fastcgi_pass app:9000;
-        fastcgi_index index.php;
+        fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
         include fastcgi_params;
-        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-        fastcgi_intercept_errors off;
-        fastcgi_buffer_size 16k;
-        fastcgi_buffers 4 16k;
+    }
+
+    location ~ /\.(?!well-known).* {
+        deny all;
     }
 }

debian/php/php-fpm.conf

@@ -0,0 +1 @@
+pm.max_children = 10

debian/php/php.ini

@@ -0,0 +1,24 @@
+[core]
+; https://www.php.net/manual/en/ini.core.php
+post_max_size=10M
+upload_max_filesize=10M
+memory_limit=512M
+
+[opcache]
+; https://www.php.net/manual/en/opcache.installation.php#opcache.installation.recommended
+opcache.enable_cli=1
+
+[jit]
+; https://wiki.php.net/rfc/jit_config_defaults
+opcache.jit=tracing
+opcache.jit_buffer_size=64M
+
+[extra]
+; http://symfony.com/doc/current/performance.html
+opcache.memory_consumption=256
+opcache.max_accelerated_files=20000
+opcache.preload=/var/www/html/preload.php
+opcache.preload_user=www-data
+opcache.validate_timestamps=0
+realpath_cache_size = 4096K
+realpath_cache_ttl = 600

debian/scripts/init.sh

@@ -0,0 +1,71 @@
+#!/bin/sh -eu
+
+# Set PDF generation browser path based on architecture
+if [ "$(dpkg --print-architecture)" = "amd64" ]; then
+    export SNAPPDF_CHROMIUM_PATH=/usr/bin/google-chrome-stable
+elif [ "$(dpkg --print-architecture)" = "arm64" ]; then
+    export SNAPPDF_CHROMIUM_PATH=/usr/bin/chromium
+fi
+
+if [ "$*" = 'supervisord -c /etc/supervisor/supervisord.conf' ]; then
+
+    # Check for required folders and create if needed
+    [ -d /var/www/html/public] || mkdir -p /var/www/html/public
+    [ -d /var/www/html/storage/app/public ] || mkdir -p /var/www/html/storage/app/public
+    [ -d /var/www/html/storage/framework/sessions ] || mkdir -p /var/www/html/storage/framework/sessions
+    [ -d /var/www/html/storage/framework/views ] || mkdir -p /var/www/html/storage/framework/views
+    [ -d /var/www/html/storage/framework/cache ] || mkdir -p /var/www/html/storage/framework/cache
+
+    # Workaround for application updates
+    if [ "$(ls -A /tmp/public)" ]; then
+        echo "Updating public folder..."
+        rm -rf /var/www/html/public/.htaccess \
+            /var/www/html/public/.well-known \
+            /var/www/html/public/*
+        cp -r /tmp/public/* \
+            /tmp/public/.htaccess \
+            /tmp/public/.well-known \
+            /var/www/html/public/ && \
+            rm -rf /tmp/public/*
+    fi
+    echo "Public Folder is up to date"
+
+    # Ensure owner, file and directory permissions are correct
+    chown -R www-data:www-data \
+        /var/www/html/public \
+        /var/www/html/storage
+    find /var/www/html/public \
+        /var/www/html/storage \
+        -type f -exec chmod 644 {} \;
+    find /var/www/html/public \
+        /var/www/html/storage \
+        -type d -exec chmod 755 {} \;
+
+    # Clear and cache config in production
+    if [ "$APP_ENV" = "production" ]; then
+        runuser -u www-data -- php artisan migrate --force       
+        runuser -u www-data -- php artisan cache:clear # Clear after the migration
+        runuser -u www-data -- php artisan ninja:design-update
+        runuser -u www-data -- php artisan optimize
+
+        # If first IN run, it needs to be initialized
+        if [ "$(runuser -u www-data -- php artisan tinker --execute='echo Schema::hasTable("accounts") && !App\Models\Account::all()->first();')" = "1" ]; then
+            echo "Running initialization..."
+            
+            runuser -u www-data -- php artisan db:seed --force
+
+            if [ -n "${IN_USER_EMAIL}" ] && [ -n "${IN_PASSWORD}" ]; then
+                runuser -u www-data -- php artisan ninja:create-account --email "${IN_USER_EMAIL}" --password "${IN_PASSWORD}"
+            else
+                echo "Initialization failed - Set IN_USER_EMAIL and IN_PASSWORD in .env"
+                exit 1
+            fi
+
+        fi
+        echo "Production setup completed"
+    fi
+
+    echo "Starting supervisord..."
+fi
+
+exec "$@"

debian/supervisor/supervisord.conf

@@ -0,0 +1,39 @@
+[supervisord]
+nodaemon=true
+user=root
+logfile=/dev/null
+logfile_maxbytes=0
+pidfile=/var/run/supervisord.pid
+
+[program:php-fpm]
+command=/usr/local/sbin/php-fpm -F
+autostart=true
+autorestart=true
+priority=5
+stdout_logfile=/dev/fd/1
+stdout_logfile_maxbytes=0
+redirect_stderr=true
+
+[program:queue-worker]
+process_name=%(program_name)s_%(process_num)02d
+command=php /var/www/html/artisan queue:work --sleep=3 --tries=3 --max-time=3600 --verbose
+autostart=true
+autorestart=true
+stopasgroup=true
+killasgroup=true
+user=www-data
+numprocs=2
+environment=HOME="/var/www"
+stdout_logfile=/dev/fd/1
+stdout_logfile_maxbytes=0
+redirect_stderr=true
+stopwaitsecs=3600
+
+[program:scheduler]
+command=php /var/www/html/artisan schedule:work --verbose
+autostart=true
+autorestart=true
+user=www-data
+stdout_logfile=/dev/fd/1
+stdout_logfile_maxbytes=0
+redirect_stderr=true

docker-compose.yml

@@ -1,86 +0,0 @@
-version: '3.7'
-
-services:
-  server:
-    image: nginx
-    restart: always
-    env_file: env
-    volumes:
-      # 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:ro
-    depends_on:
-      - app
-    # Run webserver nginx on port 80
-    # Feel free to modify depending what port is already occupied
-    ports:
-      - "80:80"
-      #- "443:443"
-    networks:
-      - invoiceninja
-    extra_hosts:
-      - "in5.localhost:192.168.0.124 " #host and ip
-
-  app:
-    image: invoiceninja/invoiceninja:5
-    env_file: env
-    restart: always
-    volumes:
-      - ./config/hosts:/etc/hosts:ro
-      - ./docker/app/public:/var/www/app/public:rw,delegated
-      - ./docker/app/storage:/var/www/app/storage:rw,delegated
-    depends_on:
-      - db
-    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
-    env_file: env
-    volumes:
-      - ./docker/mysql/data:/var/lib/mysql:rw,delegated
-
-      # remove comments for next 4 lines if you want auto sql backups
-      #- ./docker/mysql/bak:/backups:rw
-      #- ./config/mysql/backup-script:/etc/cron.daily/daily:ro
-      #- ./config/mysql/backup-script:/etc/cron.weekly/weekly:ro
-      #- ./config/mysql/backup-script:/etc/cron.monthly/monthly:ro
-    networks:
-      - invoiceninja
-    extra_hosts:
-      - "in5.localhost:192.168.0.124 " #host and ip
-
-  # THIS IS ONLY A VALID CONFIGURATION FOR IN 4. DO NOT USE FOR IN 5.
-  # cron:
-  #   image: invoiceninja/invoiceninja:alpine-4
-  #   volumes:
-      # - ./docker/app/public:/var/www/app/public:rw,delegated
-      # - ./docker/app/storage:/var/www/app/storage:rw,delegated
-      # - ./docker/app/public/logo:/var/www/app/public/logo:rw,delegated
-  #   entrypoint: |
-  #     /bin/sh -c 'sh -s <<EOF
-  #     trap "break;exit" SIGHUP SIGINT SIGTERM
-  #     sleep 300s
-  #     while /bin/true; do
-  #       ./artisan ninja:send-invoices
-  #       ./artisan ninja:send-reminders
-  #       sleep 1d
-  #     done
-  #     EOF'
-  #   networks:
-  #     - invoiceninja
-  #
-
-networks:
-  invoiceninja:

docker/app/public/.keep

@@ -1 +0,0 @@
-

docker/app/storage/.keep

@@ -1 +0,0 @@
-

env

@@ -1,26 +0,0 @@
-APP_URL=http://in.localhost:8003/
-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
-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
-
-PHANTOMJS_PDF_GENERATION=false
-
-#V4 env vars
-DB_STRICT=false
-DB_HOST=db
-DB_DATABASE=ninja
-DB_USERNAME=ninja
-DB_PASSWORD=ninja
-APP_CIPHER=AES-256-CBC

examples/v5/supervisor/Dockerfile

@@ -1,13 +0,0 @@
-FROM invoiceninja/invoiceninja:5
-
-USER root
-
-RUN apk add --no-cache supervisor \
-  && mkdir /var/log/supervisord /var/run/supervisord \
-  && chown $INVOICENINJA_USER:www-data /var/log/supervisord /var/run/supervisord
-
-COPY supervisord.conf /
-
-USER $INVOICENINJA_USER
-
-CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"]

examples/v5/supervisor/supervisord.conf

@@ -1,29 +0,0 @@
-[supervisord]
-nodaemon=true
-user=invoiceninja
-pidfile=/var/run/supervisord/supervisord.pid
-logfile=/dev/null ; nodaemon will cause logs to go to stdout
-logfile_maxbytes=0
-loglevel=error
-
-[program:php-fpm]
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
-command=php-fpm
-
-[program:scheduler]
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
-command=php artisan schedule:work
-
-[program:queue-worker]
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
-numprocs=2
-command=php artisan queue:work --sleep=3 --tries=1 --memory=1024 --timeout=3600 --daemon