Merge pull request #647 from turbo124/debian

Add storage link

.github/ISSUE_TEMPLATE/bug_report.md

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

.github/ct-install.yaml

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

.github/ct-lint.yaml

@@ -0,0 +1,9 @@
+chart-dirs:
+  - charts
+chart-repos:
+  - bitnami=https://charts.bitnami.com/bitnami
+check-version-increment: true
+debug: false
+validate-chart-schema: true
+validate-maintainers: true
+validate-yaml: true

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

@@ -0,0 +1,38 @@
+name: Build Debian Container Image
+
+on:
+  pull_request:
+    paths:
+      - "debian/**"
+  push:
+    paths:
+      - "debian/**"
+    branches:
+      - master
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: all
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build
+        id: docker_build
+        uses: docker/build-push-action@v5
+        with:
+          context: debian  
+          file: debian/Dockerfile  
+          load: true
+          tags: invoiceninja/invoiceninja-debian:test
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/build_push.yml

@@ -1,35 +0,0 @@
-name: Docker images
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  deploy:
-    name: Build images
-    runs-on: ubuntu-latest
-
-    steps:
-        - uses: actions/checkout@v1
-        
-        - name: Login to DockerHub
-          run: echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
-        
-        - name: Get the latest tag
-          id: vars
-          run: echo ::set-output name=tag::$(echo ${GITHUB_REF:10})
-
-        - name: Build image from alpine - v5
-          run: make build-alpine-v5 TAG="${{steps.vars.outputs.tag}}"
-
-        - name: Push alpine-based image - v5
-          run: make push-alpine-v5 TAG="${{steps.vars.outputs.tag}}"
-
-        - name: Build image from alpine - v4
-          run: make build-alpine TAG="${{steps.vars.outputs.tag}}"
-
-        - name: Push alpine-based image - v4
-          run: make push-alpine TAG="${{steps.vars.outputs.tag}}"
-
-        - name: Logout from DockerHub
-          run: docker logout

.github/workflows/publish-image.yaml

@@ -0,0 +1,75 @@
+name: Publish Debian Container Images
+
+on:
+  push:
+    tags-ignore:
+      - "invoiceninja-*"
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - image: invoiceninja/invoiceninja-debian
+            context: ./debian
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4  # Updated from v2
+        with:
+          fetch-depth: 0
+
+      - name: Prepare
+        id: prep
+        run: |
+          DOCKER_IMAGE=${{ matrix.image }}
+          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}"
+          
+          # 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")"
+          
+          TAGS="$TAGS,${DOCKER_IMAGE}:latest"
+
+          echo "tags=${TAGS}" >> $GITHUB_OUTPUT  # Updated output syntax
+          echo "version=${VERSION}" >> $GITHUB_OUTPUT
+          echo "major=${MAJOR}" >> $GITHUB_OUTPUT
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3  # Updated from v1
+        with:
+          platforms: all
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v3  # Updated from v1
+
+      - name: Login to DockerHub
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v3  # Updated from v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v5  # Updated from v2
+        with:
+          context: ${{ matrix.context }}
+          build-args: INVOICENINJA_VERSION=${{ steps.prep.outputs.version }}
+          platforms: linux/amd64,linux/arm64
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.prep.outputs.tags }}
+          cache-from: type=gha  # Updated cache type
+          cache-to: type=gha,mode=max
+
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}

.github/workflows/release-chart.yaml

@@ -0,0 +1,34 @@
+name: Release Charts
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - "charts/**"
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Configure Git
+        run: |
+          git config user.name "$GITHUB_ACTOR"
+          git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
+
+      - 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@v1.4.1
+        env:
+          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/test-charts.yaml

@@ -0,0 +1,111 @@
+name: Lint and Test Charts
+
+on:
+  pull_request:
+    paths:
+      - "charts/**"
+
+jobs:
+  lint-chart:
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Set up Helm
+        uses: azure/setup-helm@v3
+
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "3.9"
+          check-latest: true
+
+      - name: Set up chart-testing
+        uses: helm/chart-testing-action@v2.3.1
+
+      - name: Run chart-testing (list-changed)
+        id: list-changed
+        run: |
+          echo "::set-output name=changed::[\"$(ct list-changed --config .github/ct-lint.yaml)\"]"
+
+      - name: Parse list-changed
+        id: set-matrix
+        env:
+          CHANGED: ${{ steps.list-changed.outputs.changed }}
+        run: |
+          echo "::set-output name=matrix::$(echo "${CHANGED//\\n/\",\"}")"
+
+      - name: Run chart-testing (lint)
+        run: ct lint --config .github/ct-lint.yaml
+
+  kubeconform-chart:
+    runs-on: ubuntu-latest
+    needs:
+      - lint-chart
+    strategy:
+      matrix:
+        chart: ${{ fromJson(needs.lint-chart.outputs.matrix) }}
+        k8s:
+          - "1.25.5"
+          - "1.24.9"
+          - "1.23.15"
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Update Helm depdendencies
+        env:
+          CHART_DIR: ${{ matrix.chart }}
+        run: |
+          helm dependency update "${CHART_DIR}"
+          mkdir tmp
+          helm template "${CHART_DIR}" > tmp/combined.yaml
+
+      - uses: yokawasa/action-setup-kube-tools@v0.9.2
+        with:
+          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
+      - kubeconform-chart
+    strategy:
+      matrix:
+        k8s:
+          - 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.4.0
+        with:
+          node_image: kindest/node:${{ matrix.k8s }}
+
+      - uses: actions/setup-python@v4
+        with:
+          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

.gitignore

@@ -0,0 +1,14 @@
+# OS files
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
+
+# Helm
+charts/**/charts/
+
+# Compose filesystem
+/docker

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} --file ./alpine/Dockerfile .
-	# 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} --file ./alpine/Dockerfile_v5 .
-	@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,20 +1,95 @@
-![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)
+[![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.yaml/badge.svg)](https://github.com/invoiceninja/dockerfiles/actions/workflows/publish-image.yaml)
+[![Build Status](https://github.com/invoiceninja/dockerfiles/actions/workflows/build-image-v5.yaml/badge.svg)](https://github.com/invoiceninja/dockerfiles/actions/workflows/build-image-v5.yaml)
 
-# Docker for [Invoice Ninja](https://www.invoiceninja.com/) 
-
-:bulb: Please consider posting your question on [StackOverflow](https://stackoverflow.com/) as this widens the audience that can help you. Just use the tag `invoice-ninja` and we are there to help. This is mostly related to the usage of Invoice Ninja and the docker setup.
-If you feel your question is directly related to a code change or you want to sent in a change + PR Github is the right place, of course.
+# Debian Docker for [Invoice Ninja](https://www.invoiceninja.com/)
 
 :crown: **Features**
 
-:lock: Automatic HTTPS (:heart: [Caddy](https://caddyserver.com/))  
-:hammer: Fully production-ready through docker-compose  
-:pencil: Adjustable to your needs via environment variable  
+NGINX webserver support [NGINX](https://nginx.org/)  
+Built-in Chrome for PDF generation and other features  
+Saxon XLST 2 engine  
+OPcache  
+Multi language support  
+
+## Get started with Docker Compose
+
+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 -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`, `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
+REQUIRE_HTTPS=false
+IN_USER_EMAIL=
+IN_PASSWORD=
+```
+
+## 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
+# 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....`
+
+**Note: For PDF generation using localhost, your domain name MUST end in .test for PDFs to generate correctly due to Chrome's DNS resolver.
+
+Start the container with:
+
+```bash
+docker-compose up -d
+```
+
+**Note: When performing the setup, the Database host is ```mysql```
+
+### Updating the Image
+
+To upgrade to a newer release image, update your docker-compose.yml first by running:
+
+```bash
+docker-compose down
+docker-compose pull
+docker-compose up
+```
+
+It is recommended to perform a backup before updating.
+
+### Support
+
+If you discover a bug, please create an issue. For general queries, visit our [Forum](https://forum.invoiceninja.com/)
 
 
-## Documentation
+### Todo
 
-Please see our [wiki](https://github.com/invoiceninja/dockerfiles/wiki) for further guidance.
+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/Dockerfile

@@ -1,78 +0,0 @@
-ARG PHP_VERSION=7.2
-
-FROM php:${PHP_VERSION}-fpm-alpine
-
-LABEL maintainer="Samuel Laulhau <sam@lalop.co>, Holger Lösken <holger.loesken@codedge.de>"
-
-#####
-# SYSTEM REQUIREMENT
-#####
-ARG INVOICENINJA_VERSION
-WORKDIR /var/www/app
-
-COPY entrypoint.sh /usr/local/bin/docker-entrypoint
-RUN chmod +x /usr/local/bin/docker-entrypoint
-
-RUN set -eux; \
-    apk add --no-cache \
-    gmp-dev \
-    freetype-dev \
-    libarchive-tools \
-    libjpeg-turbo-dev \
-    libpng-dev \
-    libwebp-dev\ 
-    libzip-dev
-
-RUN docker-php-ext-configure gd --with-jpeg-dir=/usr/include/ --with-png-dir=/usr/include --with-webp-dir=/usr/include --with-freetype-dir=/usr/include/; \
-	docker-php-ext-configure zip --with-libzip; \
-	docker-php-ext-install -j$(nproc) \
-       iconv \
-       gd \
-       gmp \
-       mbstring \
-       opcache \
-       pdo \
-       pdo_mysql \
-       zip
-
-COPY ./config/php/php.ini /usr/local/etc/php/php.ini
-COPY ./config/php/php-cli.ini /usr/local/etc/php/php-cli.ini
-
-# Separate user
-ENV IN_USER=invoiceninja
-
-RUN addgroup -S "$IN_USER" && \
-    adduser \
-    --disabled-password \
-    --gecos "" \
-    --home "$(pwd)" \
-    --ingroup "$IN_USER" \ 
-    --no-create-home \
-    "$IN_USER"; \
-    addgroup "$IN_USER" www-data; \
-    chown -R "$IN_USER":"$IN_USER" .
-
-USER $IN_USER
-
-# Download and install IN
-ENV INVOICENINJA_VERSION="${INVOICENINJA_VERSION}"
-
-RUN curl -s -o /tmp/ninja.zip -SL https://download.invoiceninja.com/ninja-v${INVOICENINJA_VERSION}.zip \
-    && bsdtar --strip-components=1 -C /var/www/app -xf /tmp/ninja.zip \
-    && rm /tmp/ninja.zip \
-    && mv /var/www/app/storage /var/www/app/docker-backup-storage  \
-    && mv /var/www/app/public /var/www/app/docker-backup-public  \
-    && mkdir -p /var/www/app/public/logo /var/www/app/storage \
-    && cp /var/www/app/.env.example /var/www/app/.env \
-    && 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 LOG errorlog
-ENV SELF_UPDATER_SOURCE ''
-
-# Use to be mounted into nginx
-VOLUME /var/www/app/public
-
-ENTRYPOINT ["docker-entrypoint"]
-CMD ["php-fpm"]

alpine/Dockerfile_v5

@@ -1,127 +0,0 @@
-ARG PHP_VERSION=7.4
-
-# Get Invoice Ninja
-FROM alpine:latest as base
-ARG INVOICENINJA_VERSION
-
-RUN set -eux; \
-    apk add --no-cache \
-    curl \
-    mysql-client \
-    git \
-    libarchive-tools; \
-    mkdir -p /var/www/app
-
-RUN curl -o /tmp/ninja.tar.gz -LJ0 https://github.com/invoiceninja/invoiceninja/tarball/v$INVOICENINJA_VERSION \
-    && bsdtar --strip-components=1 -C /var/www/app -xf /tmp/ninja.tar.gz \
-    && rm /tmp/ninja.tar.gz \
-    && cp -R /var/www/app/storage /var/www/app/docker-backup-storage  \
-    && cp -R /var/www/app/public /var/www/app/docker-backup-public  \
-    && mkdir -p /var/www/app/public/logo /var/www/app/storage \
-    && cp /var/www/app/.env.example /var/www/app/.env \
-    && cp /var/www/app/.env.dusk.example /var/www/app/.env.dusk.local \
-    && rm -rf /var/www/app/docs /var/www/app/tests
-
-# Install nodejs packages
-FROM node:12-alpine as frontend
-
-COPY --from=base /var/www/app /var/www/app
-WORKDIR /var/www/app/
-
-RUN npm install
-
-# Prepare php image
-FROM php:${PHP_VERSION}-fpm-alpine
-ARG INVOICENINJA_VERSION
-ENV INVOICENINJA_VERSION=$INVOICENINJA_VERSION
-
-LABEL maintainer="Samuel Laulhau <sam@lalop.co>, Holger Lösken <holger.loesken@codedge.de>"
-
-WORKDIR /var/www/app
-
-COPY --from=frontend /var/www/app /var/www/app
-COPY entrypoint.sh /usr/local/bin/docker-entrypoint
-RUN chmod +x /usr/local/bin/docker-entrypoint
-
-RUN apt-get update && apt-get install -y libonig-dev
-
-RUN set -eux; \
-    apk add --no-cache \
-    nodejs \
-    npm \
-    mysql-client \
-    freetype-dev \
-    gmp-dev \
-    libjpeg-turbo-dev \
-    libpng-dev \
-    libzip-dev \
-    zip; \
-    docker-php-ext-configure gd --with-freetype --with-jpeg; \
-    docker-php-ext-install -j$(nproc) \
-        bcmath \
-        exif \
-        gd \
-        gmp \
-#        mbstring \
-        mysqli \
-        opcache \
-        pdo \
-        pdo_mysql \
-        zip
-
-COPY ./config/php/php.ini /usr/local/etc/php/php.ini
-COPY ./config/php/php-cli.ini /usr/local/etc/php/php-cli.ini
-
-RUN apk add --no-cache \
-      chromium \
-      nss \
-      freetype \
-      freetype-dev \
-      harfbuzz \
-      ca-certificates \
-      ttf-freefont \
-      nodejs \
-      yarn
-
-# Tell Puppeteer to skip installing Chrome. We'll be using the installed package.
-ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true \
-    PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium-browser
-
-# Puppeteer v1.19.0 works with Chromium 77.
-RUN yarn add puppeteer@1.19.0
-
-## Separate user
-ENV INVOICENINJA_USER=invoiceninja
-
-RUN addgroup -S "$INVOICENINJA_USER" && \
-    adduser \
-    --disabled-password \
-    --gecos "" \
-    --home "$(pwd)" \
-    --ingroup "$INVOICENINJA_USER" \ 
-    --no-create-home \
-    "$INVOICENINJA_USER"; \
-    addgroup "$INVOICENINJA_USER" www-data; \
-    chown -R "$INVOICENINJA_USER":"$INVOICENINJA_USER" /var/www/app
-
-# Install Composer
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer; 
-
-## Set up the cronjob and run cron daemon
-RUN echo "* * * * * run-parts /etc/periodic/1min" >> /etc/crontabs/root
-COPY ./config/cron/cronjob_v5.sh /etc/periodic/1min/invoiceninja_cronjob
-RUN chown $INVOICENINJA_USER /etc/periodic/1min/invoiceninja_cronjob && \
-    crond -l 2 -b
-
-USER $INVOICENINJA_USER
-
-RUN /usr/local/bin/composer install --no-dev --no-suggest --no-progress --quiet
-
-# Override the environment settings from projects .env file
-ENV APP_ENV production
-ENV LOG errorlog
-
-RUN php artisan storage:link
-
-ENTRYPOINT ["docker-entrypoint"]
-CMD ["php-fpm"]

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/php/php-cli.ini

@@ -1,18 +0,0 @@
-session.auto_start = Off
-short_open_tag = Off
-
-error_reporting = E_ALL & ~E_NOTICE & ~E_WARNING & ~E_STRICT & ~E_DEPRECATED
-
-opcache.enable_cli=1
-opcache.fast_shutdown=1
-opcache.memory_consumption=128
-opcache.interned_strings_buffer=8
-opcache.max_accelerated_files=4000
-opcache.revalidate_freq=60
-# http://symfony.com/doc/current/performance.html
-realpath_cache_size = 4096K
-realpath_cache_ttl = 600
-
-memory_limit = 2G
-post_max_size = 6M
-upload_max_filesize = 5M

config/php/php.ini

@@ -1,17 +0,0 @@
-session.auto_start = Off
-short_open_tag = Off
-
-error_reporting = E_ALL & ~E_NOTICE & ~E_WARNING & ~E_STRICT & ~E_DEPRECATED
-
-opcache.enable_cli=1
-opcache.fast_shutdown=1
-opcache.memory_consumption=128
-opcache.interned_strings_buffer=8
-opcache.max_accelerated_files=4000
-opcache.revalidate_freq=60
-# http://symfony.com/doc/current/performance.html
-realpath_cache_size = 4096K
-realpath_cache_ttl = 600
-
-post_max_size = 6M
-upload_max_filesize = 5M

debian/.env

@@ -0,0 +1,55 @@
+# 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='*'
+
+QUEUE_CONNECTION=redis
+
+
+# FILESYSTEM_DISK=local
+
+# 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
+#SNAPPDF_CHROMIUM_PATH=/usr/bin/google-chrome

debian/Dockerfile

@@ -0,0 +1,179 @@
+FROM php:8.2-fpm AS base
+ARG saxon=12.5.0
+
+# Install system dependencies
+RUN apt-get update && apt-get install -y \
+    git \
+    curl \
+    libpng-dev \
+    libonig-dev \
+    libxml2-dev \
+    zip \
+    unzip \
+    gosu \
+    default-mysql-client \
+    supervisor \
+    fonts-liberation \
+    libasound2 \
+    libatk-bridge2.0-0 \
+    libatk1.0-0 \
+    libatspi2.0-0 \
+    libcups2 \
+    libdbus-1-3 \
+    libdrm2 \
+    libgbm1 \
+    libgtk-3-0 \
+    libnspr4 \
+    libnss3 \
+    libwayland-client0 \
+    libxcomposite1 \
+    libxdamage1 \
+    libxfixes3 \
+    libxkbcommon0 \
+    libxrandr2 \
+    xdg-utils \
+    fonts-noto-cjk \
+    fonts-noto-cjk-extra \
+    fonts-wqy-microhei \
+    fonts-wqy-zenhei \
+    xfonts-wqy \
+    wget \
+    gnupg2 \
+    && if [ "$(dpkg --print-architecture)" = "amd64" ]; then \
+        wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
+        && echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list \
+        && apt-get update \
+        && apt-get install -y google-chrome-stable; \
+    fi \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+# Set permissions for www-data to execute    
+RUN mkdir -p /var/www/.chrome/chrome-profile \
+    && chown -R www-data:www-data /var/www/.chrome \
+    && chmod -R 755 /var/www/.chrome \
+    && if [ "$(dpkg --print-architecture)" = "amd64" ]; then \
+        chown root:root /usr/bin/google-chrome \
+        && chmod 4755 /usr/bin/google-chrome \
+        && chown -R root:root /opt/google/chrome \
+        && chmod -R 755 /opt/google/chrome; \
+    fi \
+    && chown -R www-data:www-data /var/www
+
+# Create required directories with proper permissions
+RUN mkdir -p /tmp/chrome \
+    && if [ "$(dpkg --print-architecture)" = "amd64" ]; then \
+        chown -R www-data:www-data /tmp/chrome \
+        && chmod -R 755 /tmp/chrome; \
+    fi
+    
+# Copy Install PHP extensions installer
+COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/local/bin/
+
+# Install Required PHP extensions.
+RUN install-php-extensions \
+    pdo_mysql \
+    mysqli \     
+    mbstring \
+    exif \
+    pcntl \
+    bcmath \
+    gd \
+    opcache \
+    redis \
+    soap \
+    imagick \
+    curl \
+    gmp \
+    zip \
+    @composer
+
+# Configure PHP
+COPY php/php.ini /usr/local/etc/php/conf.d/app.ini
+COPY php/php-fpm.conf /usr/local/etc/php-fpm.d/www.conf
+
+# Configure Saxon
+WORKDIR /opt
+
+RUN if [ "$(dpkg --print-architecture)" = "amd64" ]; then \
+        curl https://downloads.saxonica.com/SaxonC/HE/12/libsaxon-HEC-linux-x86_64-v${saxon}.zip --output saxon.zip \
+        && unzip saxon.zip -d saxon \
+        && cp saxon/libsaxon-HEC-linux-amd64-v${saxon}/libs/nix/libsaxon-hec-${saxon}.so /usr/lib/ \
+        && cd /opt/saxon/libsaxon-HEC-linux-amd64-v${saxon}/Saxon.C.API \
+        && phpize \
+        && ./configure --enable-saxon \
+        && make \
+        && make install \
+        && echo 'extension=saxon.so' > "/usr/local/etc/php/conf.d/app.ini"; \
+    fi
+
+# Copy scripts
+COPY rootfs /
+
+# Set working directory
+WORKDIR /var/www/html
+
+# Download and extract application
+RUN set -eux; \ 
+    DOWNLOAD_URL=$(curl -s "https://api.github.com/repos/invoiceninja/invoiceninja/releases/latest" | \
+    grep -o '"browser_download_url": "[^"]*invoiceninja.tar"' | cut -d '"' -f 4) && \
+    curl -L "$DOWNLOAD_URL" | tar -xvz -C /var/www/html && \
+    chown -R www-data:www-data /var/www/html
+
+# Install dependencies
+RUN composer install --no-dev --no-scripts --no-autoloader
+
+# Generate optimized autoloader and clear cache
+RUN composer dump-autoload --optimize \
+    && php artisan optimize \
+    && php artisan view:cache \
+    && php artisan config:cache \
+    && php artisan route:cache \
+    && php artisan storage:link
+
+# Setup supervisor
+COPY supervisor/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+
+# Add initialization script
+COPY scripts/init.sh /usr/local/bin/init.sh
+
+# Make executable
+RUN chmod +x /usr/local/bin/init.sh
+
+# Configure PHP-FPM
+RUN sed -i "s/user = www-data/user = www-data/g" /usr/local/etc/php-fpm.d/www.conf \
+    && sed -i "s/group = www-data/group = www-data/g" /usr/local/etc/php-fpm.d/www.conf
+
+# Create volume directories
+RUN mkdir -p \
+    /var/www/html/storage/app/public \
+    /var/www/html/storage/framework/cache \
+    /var/www/html/storage/framework/sessions \
+    /var/www/html/storage/framework/views \
+    /var/www/html/storage/logs \
+    /var/www/html/public/uploads \
+    /var/run \
+    /var/log/supervisor 
+
+# Set permissions
+RUN chown -R www-data:www-data \
+    /var/www/html/storage \
+    /var/www/html/bootstrap/cache \
+    /var/www/html/public/uploads \
+    /var/run \
+    /var/log/supervisor \
+    && chmod -R 775 \
+        /var/www/html/public/uploads \
+        /var/www/html/storage \
+        /var/www/html/bootstrap/cache \
+        /var/run \
+        /var/log/supervisor 
+
+# Health check
+HEALTHCHECK --interval=30s --timeout=5s --start-period=30s --retries=3 \
+    CMD php -v || exit 1
+
+EXPOSE 9000
+
+ENTRYPOINT ["/usr/local/bin/init.sh"]
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]

debian/docker-compose.yml

@@ -0,0 +1,112 @@
+version: '3.8'
+
+x-logging: &default-logging
+  options:
+    max-size: "10m"
+    max-file: "3"
+  driver: json-file
+
+services:
+  app:
+    image: invoiceninja/invoiceninja-debian:latest
+    restart: unless-stopped
+    env_file:
+      - ./.env
+    volumes:
+      - ./.env:/var/www/html/.env  
+      - app_storage:/var/www/html/storage
+      - app_cache:/var/www/html/bootstrap/cache
+      - public_storage:/var/www/html/public/storage
+
+    networks:
+      - app-network
+    depends_on:
+      mysql:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
+    deploy:
+      resources:
+        limits:
+          memory: 512M
+    logging: *default-logging
+
+  nginx:
+    image: nginx:alpine
+    restart: unless-stopped
+    ports:
+      - "80:80"
+    volumes:
+      - ./nginx/conf.d:/etc/nginx/conf.d:ro
+      - ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro
+    volumes_from:
+      - app
+
+    networks:
+      - app-network
+    depends_on:
+      - app
+    deploy:
+      resources:
+        limits:
+          memory: 128M
+    logging: *default-logging
+
+  mysql:
+    image: mysql:8.0
+    restart: unless-stopped
+    env_file:
+      - ./.env
+    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
+    networks:
+      - app-network
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u${MYSQL_USER}", "-p${MYSQL_PASSWORD}"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+    deploy:
+      resources:
+        limits:
+          memory: 1G
+    logging: *default-logging
+
+  redis:
+    image: redis:alpine
+    restart: unless-stopped
+    volumes:
+      - redis_data:/data
+    networks:
+      - app-network
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+    deploy:
+      resources:
+        limits:
+          memory: 256M
+    logging: *default-logging
+
+networks:
+  app-network:
+    driver: bridge
+
+volumes:
+  app_storage:
+    driver: local
+  app_cache:
+    driver: local
+  public_storage:
+    driver: local  # Persistent storage for user files
+  mysql_data:
+    driver: local
+  redis_data:
+    driver: local

debian/nginx/conf.d/default.conf

@@ -1,8 +1,16 @@
 server {
-    listen 80 default_server;
-    server_name in.localhost;
 
-    root /var/www/app/public/;
+    error_log  /var/log/nginx/error.log debug;
+    access_log /var/log/nginx/access.log;
+
+    listen 80 default_server;
+    server_name _;
+    
+    server_tokens off;
+    
+    client_max_body_size 100M;
+
+    root /var/www/html/public;
     index index.php;
 
     location / {
@@ -12,6 +20,11 @@ server {
     location = /favicon.ico { access_log off; log_not_found off; }
     location = /robots.txt  { access_log off; log_not_found off; }
 
+
+    location ~* /storage/.*\.php$ {
+        return 503;
+    }
+
     location ~ \.php$ {
         fastcgi_split_path_info ^(.+\.php)(/.+)$;
         fastcgi_pass app:9000;

debian/nginx/nginx.conf

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

debian/php/php-fpm.conf

@@ -0,0 +1,9 @@
+[www]
+user = www-data
+group = www-data
+listen = 0.0.0.0:9000
+pm = dynamic
+pm.max_children = 10
+pm.start_servers = 2
+pm.min_spare_servers = 1
+pm.max_spare_servers = 3

debian/php/php.ini

@@ -0,0 +1,21 @@
+session.auto_start = Off
+short_open_tag = Off
+
+error_reporting = E_ALL & ~E_NOTICE & ~E_WARNING & ~E_STRICT & ~E_DEPRECATED
+
+opcache.enable=1
+opcache.preload=/var/www/html/preload.php
+opcache.preload_user=www-data
+
+; ; The OPcache shared memory storage size.
+opcache.max_accelerated_files=300000
+opcache.validate_timestamps=1
+opcache.revalidate_freq=30
+opcache.jit_buffer_size=256M
+opcache.jit=1205
+opcache.memory_consumption=1024M
+
+
+post_max_size = 60M
+upload_max_filesize = 50M
+memory_limit=512M

debian/rootfs/docker-entrypoint-init.d/10-init-in.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+php artisan db:seed --force
+
+# Build up array of arguments...
+if [[ ! -z "${IN_USER_EMAIL}" ]]; then
+    email="--email ${IN_USER_EMAIL}"
+fi
+
+if [[ ! -z "${IN_PASSWORD}" ]]; then
+    password="--password ${IN_PASSWORD}"
+fi
+
+php artisan ninja:create-account $email $password

debian/scripts/init.sh

@@ -0,0 +1,75 @@
+#!/bin/sh
+set -e
+
+
+in_log() {
+        local type="$1"; shift
+        printf '%s [%s] [Entrypoint]: %s\n' "$(date -u '+%Y-%m-%dT%H:%M:%SZ')" "$type" "$*"
+}
+
+docker_process_init_files() {
+    echo
+    local f
+    for f; do
+        case "$f" in
+        *.sh)
+            # https://github.com/docker-library/postgres/issues/450#issuecomment-393167936
+            # https://github.com/docker-library/postgres/pull/452
+            if [ -x "$f" ]; then
+                in_log INFO "$0: running $f"
+                "$f"
+            else
+                in_log INFO "$0: sourcing $f"
+                . "$f"
+            fi
+            ;;
+        *) in_log INFO "$0: ignoring $f" ;;
+        esac
+        echo
+    done
+}
+
+# Create directories if they don't exist
+mkdir -p \
+    /var/www/html/storage/app/public \
+    /var/www/html/storage/framework/cache \
+    /var/www/html/storage/framework/sessions \
+    /var/www/html/storage/framework/views \
+    /var/www/html/storage/logs \
+    /var/www/html/public/storage
+
+# Set directory permissions without changing ownership
+chmod -R 775 \
+    /var/www/html/storage \
+    /var/www/html/bootstrap/cache \
+    /var/www/html/public/storage
+
+chown -R www-data:www-data /var/www/html/storage
+
+# Clear and cache config in production
+if [ "$APP_ENV" = "production" ]; then
+    gosu www-data php artisan config:cache
+    gosu www-data php artisan optimize
+    gosu www-data php artisan package:discover
+    gosu www-data php artisan migrate --force
+
+    echo "Checking initialization status..."
+
+    # If first IN run, it needs to be initialized
+    echo "Checking initialization status..."
+    IN_INIT=$(php artisan tinker --execute='echo Schema::hasTable("accounts") && !App\Models\Account::all()->first();')
+    echo "IN_INIT value: $IN_INIT"
+
+    if [ "$IN_INIT" = "1" ]; then
+        echo "Running initialization scripts..."
+        docker_process_init_files /docker-entrypoint-init.d/*
+    fi
+
+    echo "Production setup completed"
+    echo "IN_INIT value: $IN_INIT"
+
+fi
+
+echo "Starting supervisord..."
+# Start supervisord in the foreground
+exec /usr/bin/supervisord -n -c /etc/supervisor/conf.d/supervisord.conf

debian/supervisor/supervisord.conf

@@ -0,0 +1,52 @@
+[unix_http_server]
+file=/var/run/supervisor.sock
+chmod=0700
+
+[supervisord]
+nodaemon=true
+user=root
+logfile=/var/log/supervisor/supervisord.log
+pidfile=/var/run/supervisord.pid
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory=supervisor.rpcinterface:make_main_rpcinterface
+
+[supervisorctl]
+serverurl=unix:///var/run/supervisor.sock
+
+[program:php-fpm]
+command=/usr/local/sbin/php-fpm -F
+autostart=true
+autorestart=true
+priority=5
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+
+[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
+autostart=true
+autorestart=true
+stopasgroup=true
+killasgroup=true
+user=www-data
+numprocs=2
+redirect_stderr=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+stopwaitsecs=3600
+
+[program:scheduler]
+command=/bin/sh -c "while [ true ]; do (php /var/www/html/artisan schedule:run --verbose --no-interaction &); sleep 60; done"
+autostart=true
+autorestart=true
+user=www-data
+redirect_stderr=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0

docker-compose.yml

@@ -1,99 +0,0 @@
-version: '3.7'
-
-services:
-  server:
-    image: caddy:alpine
-    restart: always
-    environment: 
-      - APP_URL=https://localhost
-    volumes:
-      # Vhost configuration
-      - ./config/caddy/Caddyfile:/etc/caddy/Caddyfile
-
-      # Configure your mounted directories, make sure the folder 'public' and 'storage'
-      # exist, before mounting them
-      -  public:/var/www/app/public
-      -  storage:/var/www/app/storage
-      # you may use a bind-mounted host directory instead, so that it is harder to accidentally remove the volume and lose all your data!
-      # - ./docker/app/public:/var/www/app/public:rw,delegated
-      # - ./docker/app/storage:/var/www/app/storage:rw,delegated
-    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
-
-  app:
-    image: invoiceninja/invoiceninja:5
-    restart: always
-    cap_add:
-      - SYS_ADMIN
-    environment: 
-      - APP_URL=https://localhost
-      - APP_KEY=<INSERT THE GENERATED APPLICATION KEY HERE>
-      - MULTI_DB_ENABLED=false
-      - DB_HOST1=db
-      - DB_USERNAME1=ninja
-      - DB_PASSWORD1=ninja
-      - DB_DATABASE1=ninja
-    volumes:
-      # Configure your mounted directories, make sure the folder 'public' and 'storage'
-      # exist, before mounting them
-      -  public:/var/www/app/public
-      -  storage:/var/www/app/storage
-      # you may use a bind-mounted host directory instead, so that it is harder to accidentally remove the volume and lose all your data!
-      # - ./docker/app/public:/var/www/app/public:rw,delegated
-      # - ./docker/app/storage:/var/www/app/storage:rw,delegated
-    depends_on:
-      - db
-    networks: 
-      - invoiceninja  
-
-  db:
-    image: mysql:5
-    restart: always
-    environment: 
-      - MYSQL_ROOT_PASSWORD=ninjaAdm1nPassword
-      - MYSQL_USER=ninja
-      - MYSQL_PASSWORD=ninja
-      - MYSQL_DATABASE=ninja
-    volumes:
-      - mysql-data:/var/lib/mysql:rw
-      # you may use a bind-mounted host directory instead, so that it is harder to accidentally remove the volume and lose all your data!
-      # - ./docker/mysql/data:/var/lib/mysql:rw,delegated
-    networks:
-      - invoiceninja
-
-  # THIS IS ONLY A VALID CONFIGURATION FOR IN 4. DO NOT USE FOR IN 5.
-  # cron:
-  #   image: invoiceninja/invoiceninja:alpine-4
-  #   volumes:
-  #     -  storage:/var/www/app/storage
-  #     -  logo:/var/www/app/public/logo
-  #     -  public:/var/www/app/public
-  #   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
-
-volumes:
-  mysql-data:
-  public:
-  storage:
-  # This is needed for letting th cron run correctly
-  # logo:
-
-networks:
-  invoiceninja:

docker/app/public/.keep

@@ -0,0 +1 @@
+

docker/app/storage/.keep

@@ -0,0 +1 @@
+

entrypoint.sh

@@ -1,108 +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
-
-BAK_STORAGE_PATH=/var/www/app/docker-backup-storage/
-BAK_LOGO_PATH=/var/www/app/docker-backup-public/logo/
-
-if [ ! -d /var/www/app/storage ]; then
-    cp -Rp $BAK_STORAGE_PATH /var/www/app/storage
-else
-    if [ -d $BAK_STORAGE_PATH ]; then
-        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
-fi
-
-if [ ! -d /var/www/app/public/logo ] && [ -d $BAK_LOGO_PATH ]; then
-    cp -Rp $BAK_LOGO_PATH /var/www/app/public/logo
-else
-    if [ -d $BAK_LOGO_PATH ]; then
-        IN_LOGO_BACKUP="$(ls $BAK_LOGO_PATH)"
-        for path in $IN_LOGO_BACKUP; do
-            if [ ! -e "/var/www/app/public/logo/$path" ]; then
-                cp -Rp "$BAK_LOGO_PATH/$path" "/var/www/app/public/logo/"
-            fi
-        done
-    fi
-fi
-
-# compare public volume version with image version
-if [ ! -e /var/www/app/public/version ] || [ "$INVOICENINJA_VERSION" != "$(cat /var/www/app/public/version)" ]; then
-    cp -au /var/www/app/docker-backup-public/* /var/www/app/public/
-    echo $INVOICENINJA_VERSION > /var/www/app/public/version
-fi
-
-# Set permission for web server to create/update files
-chown -R invoiceninja: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
-php artisan config:cache
-php artisan optimize
-
-exec docker-php-entrypoint "$@"