4.5.14

2026-01-03 13:07:30 +01:00 · 2019-07-22 09:46:08 +02:00
29 changed files with 383 additions and 841 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,24 +0,0 @@
-# EditorConfig is awesome: https://EditorConfig.org
-
-# top-most EditorConfig file
-root = true
-
-# Unix-style newlines with a newline ending every file
-[*]
-end_of_line = lf
-insert_final_newline = true
-
-# Matches multiple files with brace expansion notation
-# Set default charset
-[*.*]
-charset = utf-8
-
-# Tab indentation (no size specified)
-[Makefile]
-indent_style = tab
-
-# Matches the files *.yml
-[*.yml]
-indent_style = space
-indent_size = 2
-
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,26 +0,0 @@
---
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
---
-
-# Before creating an issue
-
-Be sure the issue isn't yet reported here or dicussed on stackoverflow
-
-# Logs
-
-Did you check the logs ?
-If any Error is present there please copy/paste it below 
-
-```
-Any Error that sucks
-```
-
-# Setup information
-
-What version do you run?
-Do you run docker-compose or a single Dockerfile ?
--- a/.github/workflows/build_push.yml
+++ b/.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
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,76 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, sex characteristics, gender identity and expression,
-level of experience, education, socio-economic status, nationality, personal
-appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
- advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
- address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
- professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at contact@invoiceninja.com. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
-
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see
-https://www.contributor-covenant.org/faq
--- a/86
+++ b/86
@@ -0,0 +1,86 @@
+ARG PHP_IMAGE_TAG=7.2-fpm
+FROM php:${PHP_IMAGE_TAG}
+
+LABEL maintainer="Samuel Laulhau <sam@lalop.co>"
+
+#####
+# SYSTEM REQUIREMENT
+#####
+ENV BUILD_DEPS \
+        zlib1g-dev \
+        git \
+        libgmp-dev \
+        unzip \
+        libfreetype6-dev \
+        libjpeg62-turbo-dev \
+        libpng-dev \
+        build-essential \
+        chrpath \
+        libssl-dev \
+        libxft-dev \
+        libfreetype6 \
+        libfontconfig1 \
+        libfontconfig1-dev
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends $BUILD_DEPS \
+    && ln -s /usr/include/x86_64-linux-gnu/gmp.h /usr/local/include/ \
+    && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
+    && docker-php-ext-configure gmp \
+    && docker-php-ext-install iconv mbstring pdo pdo_mysql zip gd gmp opcache
+
+ENV PHANTOMJS phantomjs-2.1.1-linux-x86_64
+# Install PHANTOMJS
+RUN curl -o ${PHANTOMJS}.tar.bz2 -SL https://bitbucket.org/ariya/phantomjs/downloads/${PHANTOMJS}.tar.bz2 \
+    && tar xvjf ${PHANTOMJS}.tar.bz2 \
+    && rm ${PHANTOMJS}.tar.bz2 \
+    && mv ${PHANTOMJS} /usr/local/share \
+    && ln -sf /usr/local/share/${PHANTOMJS}/bin/phantomjs /usr/local/bin \
+    && rm -rf /var/lib/apt/lists/*
+    
+# set recommended PHP.ini settings
+# see https://secure.php.net/manual/en/opcache.installation.php
+RUN { \
+		echo 'opcache.memory_consumption=128'; \
+		echo 'opcache.interned_strings_buffer=8'; \
+		echo 'opcache.max_accelerated_files=4000'; \
+		echo 'opcache.revalidate_freq=60'; \
+		echo 'opcache.fast_shutdown=1'; \
+		echo 'opcache.enable_cli=1'; \
+} > /usr/local/etc/php/conf.d/opcache-recommended.ini
+
+#####
+# DOWNLOAD AND INSTALL INVOICE NINJA
+#####
+
+ENV INVOICENINJA_VERSION 4.5.14
+
+RUN curl -o ninja.zip -SL https://download.invoiceninja.com/ninja-v${INVOICENINJA_VERSION}.zip \
+    && unzip ninja.zip -d /var/www/ \
+    && rm ninja.zip \
+    && mv /var/www/ninja /var/www/app  \
+    && 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 \
+    && touch /var/www/app/.env \
+    && chmod -R 755 /var/www/app/storage  \
+    && chown -R www-data:www-data /var/www/app/storage /var/www/app/bootstrap /var/www/app/public/logo /var/www/app/.env /var/www/app/docker-backup-storage /var/www/app/docker-backup-public\
+    && rm -rf /var/www/app/docs /var/www/app/tests /var/www/ninja
+
+######
+# DEFAULT ENV
+######
+ENV LOG errorlog
+ENV SELF_UPDATER_SOURCE ''
+ENV PHANTOMJS_BIN_PATH /usr/local/bin/phantomjs
+
+
+#use to be mounted into nginx for exemple
+VOLUME /var/www/app/public
+
+WORKDIR /var/www/app
+
+COPY entrypoint.sh /entrypoint.sh
+
+ENTRYPOINT ["/entrypoint.sh"]
+CMD ["php-fpm"]
--- a/58
+++ b/58
@@ -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
--- a/README.md
+++ b/README.md
@@ -1,79 +1,40 @@
-![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)
+DockerFile for invoice ninja (https://www.invoiceninja.com/)

-# Docker for [Invoice Ninja](https://www.invoiceninja.com/) 
+This image is based on `php:7.0-fpm` official version.

-:crown: **Features**
+To make your data persistent, you have to mount `/var/www/app/public/logo` and `/var/www/app/storage`.

-:lock: Automatic HTTPS (:heart: [Caddy](https://caddyserver.com/))  
-:fire: NGINX webserver support [NGINX](https://nginx.org/)  
-:hammer: Fully production-ready through docker-compose  
-:pencil: Adjustable to your needs via environment variable  

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

-## Quickstart V5 Launch
-
-The dockerfile has been revamped to make is easier to get started, by default the base image selected in 5 which will pull in the latest v5 stable image.
+To run it:

 ```
-git clone https://github.com/invoiceninja/dockerfiles.git
-cd dockerfiles
+docker run -d \
+  -e APP_ENV='production' \
+  -e APP_DEBUG=0 \
+  -e APP_URL='http://ninja.dev' \
+  -e APP_KEY='SomeRandomStringSomeRandomString' \
+  -e APP_CIPHER='AES-256-CBC' \
+  -e DB_TYPE='mysql' \
+  -e DB_STRICT='false' \
+  -e DB_HOST='localhost' \
+  -e DB_DATABASE='ninja' \
+  -e DB_USERNAME='ninja' \
+  -e DB_PASSWORD='ninja' \
+  -p '80:80' \
+  invoiceninja/invoiceninja
 ```
-
-Instead of defining our environment variables inside our docker-compose.yml file we now define this in the ```env``` file, open this file up and insert your APP_URL and your APP_KEY
-
-```
-APP_URL=http://in.localhost:8003/
-APP_KEY=<insert your generated key in here>
-APP_DEBUG=true
-MULTI_DB_ENABLED=false
-DB_HOST1=db
-DB_USERNAME1=ninja
-DB_PASSWORD1=ninja
-DB_DATABASE1=ninja
-PHANTOMJS_PDF_GENERATION=false
-```
-
-The ```APP_KEY``` can be generated by running
-
-```
-docker run --rm -it invoiceninja/invoiceninja php artisan key:generate --show
-```
-
-Copy the entire string and insert in the env file at ```APP_KEY=base64....```
-
-To ensure folder permissions are correct when the container comes up for the first time it is important that you set the correct folder permissions on the ```docker``` folder.
-
-From the terminal run
-
-```sudo chown -R 1500:1500 docker/app```
-
-### Note for people running the container locally on their PC ###
-
-If you are running the container locally, then the container will need to resolve the host, to support this you will want to insert your LAN IP address and the host name in the hosts file located in ```config/hosts```
-
-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:
+A list of environment variables can be found [here](https://github.com/invoiceninja/invoiceninja/blob/master/.env.example)


-```192.168.0.124 in5.test```
-
-**Please note that PDF generation using local host your domain name MUST end in .test for your PDFs to generate correctly, this is a DNS resolver issue with chromium.
-
-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```
-
-## 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/)
+### With docker-compose

+A pretty ready to use docker-compose configuration can be found into [`./docker-compose`](https://github.com/invoiceninja/dockerfiles/tree/master/docker-compose).
+Rename `.env.example` into `.env` and change the environment's variable as needed.
+The file assume that all your persistent data is mounted from `/srv/invoiceninja/`.
+Once started the application should be accessible at http://localhost:8000/

+### Know issue

+Phantomjs doesn't work on linux alpine https://github.com/ariya/phantomjs/issues/14186
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -1,73 +1,69 @@
-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/
+ARG PHP_IMAGE_TAG=7.2-fpm-alpine
+FROM php:${PHP_IMAGE_TAG}

-FROM php:${PHP_VERSION}-fpm-alpine
-
-LABEL maintainer="David Bomba <turbo124@gmail.com>"
+LABEL maintainer="Samuel Laulhau <sam@lalop.co>"

 #####
 # SYSTEM REQUIREMENT
 #####
-ARG INVOICENINJA_VERSION
-ARG BAK_STORAGE_PATH
-ARG BAK_PUBLIC_PATH
-ENV BAK_STORAGE_PATH $BAK_STORAGE_PATH
-ENV BAK_PUBLIC_PATH $BAK_PUBLIC_PATH
-WORKDIR /var/www/app
+ENV PHANTOMJS phantomjs-2.1.1-linux-x86_64
+RUN apk update \
+ && apk add --no-cache git gmp-dev freetype-dev libjpeg-turbo-dev \
+            coreutils chrpath fontconfig libpng-dev

-COPY entrypoint.sh /usr/local/bin/docker-entrypoint
-RUN chmod +x /usr/local/bin/docker-entrypoint \
-    && mv /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
+RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
+    && docker-php-ext-configure gmp \
+    && docker-php-ext-install iconv mbstring pdo pdo_mysql zip gd gmp opcache \
+    && echo "php_admin_value[error_reporting] = E_ALL & ~E_NOTICE & ~E_WARNING & ~E_STRICT & ~E_DEPRECATED">>/usr/local/etc/php-fpm.d/www.conf
+    
+RUN cd /usr/share \
+    && curl  -L https://github.com/Overbryd/docker-phantomjs-alpine/releases/download/2.11/phantomjs-alpine-x86_64.tar.bz2 | tar xj \
+    && ln -s /usr/share/phantomjs/phantomjs /usr/local/bin/phantomjs
+    

-# 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/
+# set recommended PHP.ini settings
+# see https://secure.php.net/manual/en/opcache.installation.php
+RUN { \
+		echo 'opcache.memory_consumption=128'; \
+		echo 'opcache.interned_strings_buffer=8'; \
+		echo 'opcache.max_accelerated_files=4000'; \
+		echo 'opcache.revalidate_freq=60'; \
+		echo 'opcache.fast_shutdown=1'; \
+		echo 'opcache.enable_cli=1'; \
+} > /usr/local/etc/php/conf.d/opcache-recommended.ini

-RUN install-php-extensions \
-    gd \
-    gmp \
-    opcache \
-    pdo_mysql \
-    zip
+#####
+# DOWNLOAD AND INSTALL INVOICE NINJA
+#####

-COPY ./config/php/php.ini /usr/local/etc/php/conf.d/in-php.ini
+ENV INVOICENINJA_VERSION 4.5.14

-# Separate user
-ENV INVOICENINJA_USER=invoiceninja
-
-RUN addgroup --gid=1500 -S "$INVOICENINJA_USER" && \
-    adduser --uid=1500 \
-    --disabled-password \
-    --gecos "" \
-    --home "$(pwd)" \
-    --ingroup "$INVOICENINJA_USER" \ 
-    --no-create-home \
-    "$INVOICENINJA_USER"; \
-    addgroup "$INVOICENINJA_USER" www-data; \
-    chown -R "$INVOICENINJA_USER":"$INVOICENINJA_USER" .
-
-USER 1500
-
-# Download and install IN
-ENV INVOICENINJA_VERSION="${INVOICENINJA_VERSION}"
-
-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  \
+RUN curl -o ninja.zip -SL https://download.invoiceninja.com/ninja-v${INVOICENINJA_VERSION}.zip \
+    && unzip ninja.zip -d /var/www/ \
+    && rm ninja.zip \
+    && mv /var/www/ninja /var/www/app  \
+    && 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 \
+    && touch /var/www/app/.env \
    && chmod -R 755 /var/www/app/storage  \
-    && rm -rf /var/www/app/docs /var/www/app/tests
+    && rm -rf /var/www/app/docs /var/www/app/tests /var/www/ninja

-# Override the environment settings from projects .env file
+######
+# DEFAULT ENV
+######
 ENV LOG errorlog
 ENV SELF_UPDATER_SOURCE ''
+ENV PHANTOMJS_BIN_PATH /usr/local/bin/phantomjs

-# Use to be mounted into nginx
+
+#use to be mounted into nginx for exemple
 VOLUME /var/www/app/public

-ENTRYPOINT ["docker-entrypoint"]
-CMD ["php-fpm"]
+WORKDIR /var/www/app
+
+COPY entrypoint.sh /usr/local/bin/invoice-entrypoint
+# RUN chmod +x /usr/local/bin/invoice-entrypoint
+
+ENTRYPOINT ["invoice-entrypoint"]
+CMD ["php-fpm"]
--- a/alpine/Dockerfile_v5
+++ b/alpine/Dockerfile_v5
@@ -1,105 +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 node:lts-alpine as frontend
-ARG INVOICENINJA_VERSION
-ARG BAK_STORAGE_PATH
-ARG BAK_PUBLIC_PATH
-
-# Install dependencies
-RUN set -eux; \
-    apk add --no-cache \
-    curl
-
-# Download Invoice Ninja
-RUN curl -o /tmp/ninja.tar.gz -L https://github.com/invoiceninja/invoiceninja/tarball/v$INVOICENINJA_VERSION \
-    && mkdir -p /var/www/app \
-    && 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
-ARG INVOICENINJA_VERSION
-ARG BAK_STORAGE_PATH
-ARG BAK_PUBLIC_PATH
-ENV INVOICENINJA_VERSION $INVOICENINJA_VERSION
-ENV BAK_STORAGE_PATH $BAK_STORAGE_PATH
-ENV BAK_PUBLIC_PATH $BAK_PUBLIC_PATH
-
-LABEL maintainer="David Bomba <turbo124@gmail.com>"
-
-WORKDIR /var/www/app
-
-COPY --from=frontend /var/www/app /var/www/app
-COPY entrypoint.sh /usr/local/bin/docker-entrypoint
-RUN chmod +x /usr/local/bin/docker-entrypoint \
-    && mv /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
-
-# 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 \
-    bcmath \
-    exif \
-    gd \
-    gmp \
-    mysqli \
-    opcache \
-    pdo_mysql \
-    zip \
-    @composer
-
-# Install chromium
-RUN set -eux; \
-    apk add --no-cache \
-    supervisor \
-    mysql-client \
-    git \
-    chromium \
-    ttf-freefont
-
-COPY ./config/php/php.ini /usr/local/etc/php/conf.d/in-php.ini
-COPY ./config/supervisor/supervisord.conf /
-
-## Separate user
-ARG UID=1500
-ENV INVOICENINJA_USER=invoiceninja
-
-RUN addgroup --gid=$UID -S "$INVOICENINJA_USER" \
-    && adduser --uid=$UID \
-    --disabled-password \
-    --gecos "" \
-    --home "$(pwd)" \
-    --ingroup "$INVOICENINJA_USER" \ 
-    --no-create-home \
-    "$INVOICENINJA_USER" \
-    && addgroup "$INVOICENINJA_USER" www-data \
-    && mkdir /var/log/supervisord /var/run/supervisord \
-    && chown -R "$INVOICENINJA_USER":"$INVOICENINJA_USER" /var/www/app \
-    && chown $INVOICENINJA_USER:www-data /var/log/supervisord /var/run/supervisord
-
-USER $UID
-
-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 ["/usr/bin/supervisord", "-c", "/supervisord.conf"]
--- a/alpine/entrypoint.sh
+++ b/alpine/entrypoint.sh
@@ -0,0 +1,47 @@
+#!/bin/sh
+set -e
+
+if [ ! -d /var/www/app/storage ]; then
+	cp -Rp /var/www/app/docker-backup-storage /var/www/app/storage
+else
+	IN_STORAGE_BACKUP="$(ls /var/www/app/docker-backup-storage/)"
+	for path in $IN_STORAGE_BACKUP; do
+		if [ ! -e "/var/www/app/storage/$path" ]; then
+			cp -Rp "/var/www/app/docker-backup-storage/$path" "/var/www/app/storage/"
+		fi
+	done
+fi
+
+if [ ! -d /var/www/app/public/logo ]; then
+	cp -Rp /var/www/app/docker-backup-public/logo /var/www/app/public/logo
+else
+	IN_LOGO_BACKUP="$(ls /var/www/app/docker-backup-public/logo/)"
+	for path in $IN_LOGO_BACKUP; do
+		if [ ! -e "/var/www/app/public/logo/$path" ]; then
+			cp -Rp "/var/www/app/docker-backup-public/logo/$path" "/var/www/app/public/logo/"
+		fi
+	done
+fi
+
+# compare public volume version with image version
+if [ ! -e /var/www/app/public/version ] || [ "$INVOICENINJA_VERSION" != "$(cat /var/www/app/public/version)" ]; then
+  echo 'clone public directory'
+  cp -Rp /var/www/app/docker-backup-public/* /var/www/app/public/
+  echo $INVOICENINJA_VERSION > /var/www/app/public/version
+fi
+
+# fix permission for monted directories
+chown www-data:www-data /var/www/app/storage
+chown www-data:www-data /var/www/app/public/logo
+
+
+#php artisan optimize --force
+#php artisan migrate --force
+
+#if [ ! -e "/var/www/app/is-seeded" ]; then
+	#php artisan db:seed --force
+	#touch "/var/www/app/is-seeded"
+#fi
+
+echo 'start'
+exec "$@"
--- a/config/caddy/Caddyfile
+++ b/config/caddy/Caddyfile
@@ -1,6 +0,0 @@
-{$APP_URL} {
-    root * /var/www/app/public
-    php_fastcgi app:9000
-    encode zstd gzip
-    file_server browse
-}
--- a/config/cron/cronjob_v5.sh
+++ b/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
--- a/config/hosts
+++ b/config/hosts
@@ -1 +0,0 @@
-192.168.0.124 in5.test
--- a/config/mysql/Dockerfile
+++ b/config/mysql/Dockerfile
@@ -1,10 +0,0 @@
-FROM mysql:5
-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
--- a/config/mysql/backup-script
+++ b/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;
--- a/config/nginx/in-vhost.conf
+++ b/config/nginx/in-vhost.conf
@@ -1,25 +0,0 @@
-server {
-    listen 80 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 app: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;
-    }
-}
--- a/config/php/php.ini
+++ b/config/php/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
--- a/config/shutdown.sh
+++ b/config/shutdown.sh
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-printf "READY\n";
-
-while read line; do
-  echo "Processing Event: $line" >&2;
-  kill -SIGQUIT $PPID
-done < /dev/stdin
--- a/config/supervisor/supervisord.conf
+++ b/config/supervisor/supervisord.conf
@@ -1,47 +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]
-autostart=true
-autorestart=true
-redirect_stderr=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
-command=php-fpm
-
-[program:scheduler]
-autostart=true
-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
-autostart=true
-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=3 --memory=256
-
-[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
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,90 +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: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
-    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
-      - ./config/shutdown.sh:/usr/local/bin/shutdown.sh
-      - ./docker/app/public:/var/www/app/public:rw,delegated
-      - ./docker/app/storage:/var/www/app/storage:rw,delegated
-    depends_on:
-      - db
-    networks: 
-      - invoiceninja  
-    extra_hosts:
-      - "in5.localhost:192.168.0.124 " #host and ip
-
-  db:
-    image: mysql:5
-#    For auto DB backups comment out image and use the build block below
-#    build:
-#      context: ./config/mysql
-    ports:
-      - "3305:3306"
-    restart: always
-    environment: 
-      - MYSQL_ROOT_PASSWORD=ninjaAdm1nPassword
-      - MYSQL_USER=ninja
-      - MYSQL_PASSWORD=ninja
-      - MYSQL_DATABASE=ninja
-    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:
--- a/docker-compose/.env.example
+++ b/docker-compose/.env.example
@@ -0,0 +1,17 @@
+MYSQL_DATABASE=ninja
+MYSQL_ROOT_PASSWORD=pwd
+
+APP_DEBUG=0
+APP_URL=http://localhost:8000
+APP_KEY=SomeRandomStringSomeRandomString
+APP_CIPHER=AES-256-CBC
+DB_USERNAME=root
+DB_PASSWORD=pwd
+DB_HOST=mysql
+DB_DATABASE=ninja
+MAIL_HOST=mail.service.host
+MAIL_USERNAME=username
+MAIL_PASSWORD=password
+MAIL_DRIVER=smtp
+MAIL_FROM_NAME="My name"
+MAIL_FROM_ADDRESS=user@mail.com
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -0,0 +1,70 @@
+version: '3.6'
+
+volumes:
+  db:
+  storage:
+  logo:
+  public:
+
+# uncomment if you want to use external network (example network: "web")
+#networks:
+#  web:
+#    external: true
+
+services:
+  db:
+    image: mysql:5
+    env_file: .env
+    restart: always
+    volumes:
+      - db:/var/lib/mysql
+    networks:
+      - default
+
+  app:
+    image: invoiceninja/invoiceninja
+    env_file: .env
+    restart: always
+    depends_on:
+      - db
+    volumes:
+      -  storage:/var/www/app/storage
+      -  logo:/var/www/app/public/logo
+      -  public:/var/www/app/public
+    networks: 
+      - default  
+
+  web:
+    image: nginx:1
+    volumes:
+      - ./nginx.conf:/etc/nginx/nginx.conf:ro
+      -  storage:/var/www/app/storage
+      -  logo:/var/www/app/public/logo
+      -  public:/var/www/app/public
+    expose: # Expose ports without publishing them to the host machine - they’ll only be accessible to linked services.
+      - "80"
+    ports: # Delete if you want to use reverse proxy
+      - 8000:80
+    networks:
+#      - web        # uncomment if you want to use  external network (reverse proxy for example)
+      - default
+
+  cron:
+    image: invoiceninja/invoiceninja
+    env_file: .env
+    volumes:
+      -  storage:/var/www/app/storage
+      -  logo:/var/www/app/public/logo
+      -  public:/var/www/app/public
+    entrypoint: |
+      bash -c 'bash -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:
+      - default
--- a/docker-compose/nginx.conf
+++ b/docker-compose/nginx.conf
@@ -0,0 +1,50 @@
+user www-data;
+
+events {
+  worker_connections 768;
+}
+
+http {
+    upstream backend {
+        server app:9000;
+    }
+    include /etc/nginx/mime.types;
+    default_type application/octet-stream;
+    gzip on;
+    gzip_disable "msie6";
+
+    server {
+        listen      80 default;
+        server_name your_ininja_site;
+
+        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; }
+
+        sendfile off;
+
+        location ~ \.php$ {
+            fastcgi_split_path_info ^(.+\.php)(/.+)$;
+            fastcgi_pass backend;
+            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;
+        }
+
+        location ~ /\.ht {
+            deny all;
+        }
+    }
+}
--- a/docker/app/public/.keep
+++ b/docker/app/public/.keep
@@ -1 +0,0 @@
-
--- a/docker/app/storage/.keep
+++ b/docker/app/storage/.keep
@@ -1 +0,0 @@
-
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,109 +1,46 @@
-#!/usr/bin/env sh
+#!/bin/bash
 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 "$@"
+if [ ! -d /var/www/app/storage ]; then
+	cp -Rp /var/www/app/docker-backup-storage /var/www/app/storage
+else
+	IN_STORAGE_BACKUP="$(ls /var/www/app/docker-backup-storage/)"
+	for path in $IN_STORAGE_BACKUP; do
+		if [ ! -e "/var/www/app/storage/$path" ]; then
+			cp -Rp "/var/www/app/docker-backup-storage/$path" "/var/www/app/storage/"
+		fi
+	done
 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
+if [ ! -d /var/www/app/public/logo ]; then
+	cp -Rp /var/www/app/docker-backup-public/logo /var/www/app/public/logo
+else
+	IN_LOGO_BACKUP="$(ls /var/www/app/docker-backup-public/logo/)"
+	for path in $IN_LOGO_BACKUP; do
+		if [ ! -e "/var/www/app/public/logo/$path" ]; then
+			cp -Rp "/var/www/app/docker-backup-public/logo/$path" "/var/www/app/public/logo/"
+		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
+# compare public volume version with image version
+if [ ! -e /var/www/app/public/version ] || [ "$INVOICENINJA_VERSION" != "$(cat /var/www/app/public/version)" ]; then
+  echo 'clone public directory'
+  cp -Rp /var/www/app/docker-backup-public/* /var/www/app/public/
+  echo $INVOICENINJA_VERSION > /var/www/app/public/version
 fi
-rm -rf "$BAK_PUBLIC_PATH"

-# Set permission for web server to create/update files
-chown -R "$INVOICENINJA_USER":www-data /var/www/app/storage /var/www/app/public /var/www/app/bootstrap
+# fix permission for monted directories
+chown www-data:www-data /var/www/app/storage
+chown	 www-data:www-data /var/www/app/public/logo

-# 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'
+#php artisan optimize --force
+#php artisan migrate --force

-# Run Laravel stuff
-php artisan config:cache
-php artisan optimize
-php artisan migrate --force
+#if [ ! -e "/var/www/app/is-seeded" ]; then
+	#php artisan db:seed --force
+	#touch "/var/www/app/is-seeded"
+#fi

-exec docker-php-entrypoint "$@"
+echo 'start'
+exec "$@"
--- a/19
+++ b/19
@@ -1,19 +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_USERNAME1=ninja
-DB_PASSWORD1=ninja
-DB_DATABASE1=ninja
-
-#this is a system variable please do not remove
-IS_DOCKER=true
-
-#V4 env vars
-DB_STRICT=false
-DB_HOST=db
-DB_DATABASE=ninja
-DB_USERNAME=ninja
-DB_PASSWORD=ninja
-APP_CIPHER=AES-256-CBC
--- a/examples/v5/supervisor/Dockerfile
+++ b/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"]
--- a/examples/v5/supervisor/supervisord.conf
+++ b/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