4.5.14

2026-01-03 21:17:27 +01:00 · 2019-07-22 09:46:08 +02:00
17 changed files with 369 additions and 681 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/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,185 +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.

-: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.
-
-: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  
+To make your data persistent, you have to mount `/var/www/app/public/logo` and `/var/www/app/storage`.


-## Prerequisites
-
-### Generate an application key
-
-Before starting Invoice Ninja via Docker make sure you generate a valid application key. If you are not sure what an application key is, please visit [this blog post](https://tighten.co/blog/app-key-and-you/).  
-
-To generate an application key just run
-
-```shell
-docker run --rm -it invoiceninja/invoiceninja php artisan key:generate --show
-```
-
-This will generate an application key for you which you need later.
-
-### Create folders for data persistence
-
-To make your data persistent, you have to mount `public` and `storage` from your host to your containers.
-
-1. Create two folder on your host, e. g. `/var/invoiceninja/public` and `/var/invoiceninja/storage`
-2. Mount these folders into your container - see [usage](#usage)
-
-You can create these folders wherever you want on your host system.
-
-:warning: When using host mounted folder for persistence, make sure they are owned by the proper user and group. As we run Invoice Ninja without `root` , we use a separate user, the folders on the host system need to be owned by uid `1000` and a gid `101`.  
-
-Run this on your host system
-
-```shell
-chown -R 1000:101 /var/invoiceninja/public /var/invoiceninja/storage
-```
-
-to apply the proper permission to the folders. This also applies to the `docker-compose` setup when using [bind-mounted host directories](https://github.com/invoiceninja/dockerfiles/blob/master/docker-compose.yml#L17).
-
-
-### PhantomJS key
-
-The PhantomJS key is set to `a-demo-key-with-low-quota-per-ip-address`. This demo key is limited to 100 requests per day.
-
-To set a different key feel free to add `-e PHANTOMJS_CLOUD_KEY='<INSERT YOUR PHANTOMJS KEY HERE>'` to thee docker command below.
-
-For further configuration and toubleshotting regarding PhantomJS and Invoice Ninja [see documentation here](https://docs.invoiceninja.com/configure.html?#phantomjs).
-
-
-## Usage
-
-:warning: The `latest` tag contains the new version 5 of Invoice Ninja which is still in alpha state. To stick to the version 4 please use `alpine-4` tag.
+### Usage

 To run it:

-```shell
+```
 docker run -d \
-  -v /var/invoiceninja/public:/var/app/public \
-  -v /var/invoiceninja/storage:/var/app/storage \
+  -e APP_ENV='production' \
+  -e APP_DEBUG=0 \
  -e APP_URL='http://ninja.dev' \
-  -e APP_KEY='<INSERT THE GENERATED APPLICATION KEY HERE>' \
+  -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 '9000:9000' \
-  --name invoiceninja \
-  invoiceninja/invoiceninja:alpine-4
+  -p '80:80' \
+  invoiceninja/invoiceninja
 ```
-A list of environment variables can be found [here](https://github.com/invoiceninja/invoiceninja/blob/master/.env.example).
+A list of environment variables can be found [here](https://github.com/invoiceninja/invoiceninja/blob/master/.env.example)


 ### With docker-compose

-Running Invoice Ninja with docker-compose gives you everything to quickly start. Before starting please make sure you configured your setup correctly. You can do so by opening the `docker-compose.yml` and may change the follwing items.
+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/

-:warning: The `docker-compose.yml` runs the new version 5 of Invoice Ninja which is still in alpha state. To stick to the version 4 please use `alpine-4` tag.
+### Know issue

-**Port**
-
-_default: 80_  
-
-This is the port where your Invoice Ninja is reachable, when you type in `http://<your-domain.com>`. If it should be different than `80` make sure to call your installation `http://<your-domain.com>:<YOUR-PORT>`, e. g. `http://<your-domain.com>:8080`.
-
-```yml
-ports: 
-  - "8080:80" # To run it on port 8080
-```
-
-:warning: Make sure the port set is available and not occupied by another service on your host system.
-
-**URL and application key**
-
-_default: https://localhost_
-
-For generating a proper application key see [generate an application key](#generate-an-application-key). Change the value where your Invoice Ninja installation should be reachable.
-
-```yml
-environment: 
-  - APP_URL=http://localhost
-````
-
-**MYSQL root password**
-
-_default: ninjaAdm1nPassword_
-
-The mysql database server comes with two users: one for accessing the Invoice Ninja database and the `root` user. Please change the default password for `root` to something more special :wink:
-
-**Volumes and directories**
-
-_default: volumes_
-
-This is the place where your uploaded files are stored. Normally this is a so called _volume_ which can be reused by different docker containers. One might prefer to store the files directly on the host system - for this the config section is prepared with what is called _bind-mounted host directory_. Just adjust the paths and Invoice Ninja stores the user files on the host system.
-
-```yml
-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
-```
-
-The sample above stores the files on the post at `./docker/app/public` and `./docker/app/storage`.
-
-:warning: If using bind-mounted host directories make sure they exists and have proper rights. See [here](#create-folders-for-data-persistence) for details.
-
-## Docker secrets
-
-:information_source: This feature is borrowed from [mariadb docker image](https://hub.docker.com/_/mariadb).
-
-As an alternative to passing sensitive information via environment variables, `_FILE` may be appended to the below listed environment variables, causing the initialization script to load the values for those variables from files present in the container. In particular, this can be used to load passwords from Docker secrets stored in _/run/secrets/<secret_name>_ files.
-
-Supported are these variables:  
-`APP_KEY`, `API_SECRET`, `CLOUDFLARE_API_KEY`, `DB_USERNAME`, `DB_PASSWORD`, `MAIL_USERNAME`, `MAIL_PASSWORD`, `MAILGUN_SECRET`, `S3_KEY`, `S3_SECRET`
-
-
-## Debugging your Docker setup
-
-Even when running your Invoice Ninja setup with Docker - errors can occur. Depending on where the error happens - the webserver, Invoice Ninja or the database - different log files can be responsible. 
-
-### Show logs without `docker-compose`
-
-If you are not running `docker-compose` you first need to find the container id for your php container with `docker ps`. Then you can run
-
-```shell
-docker logs -f <CONTAINER NAME>
-```
-
-This gives you a constant output of the log files for the php container.
-
-### Show logs with `docker-compose`
-
-If you are running the `docker-compose` setup you can output all logs, from all containers, with the following command
-
-```shell
-docker-compose logs -f
-```
-
-If you better want a physical log file in in your `storage/logs` folder, just add `-e LOG=single` to the [usage](#usage) command. 
-Or add an environment variable 
-
-```yml
-...
-environment:
-  LOG: single
-...
-```
-
-to your `docker-compose.yml`.
-
-This generated log file will only hold Invoice Ninja information.
+Phantomjs doesn't work on linux alpine https://github.com/ariya/phantomjs/issues/14186
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -1,78 +1,69 @@
-ARG PHP_VERSION=7.2
+ARG PHP_IMAGE_TAG=7.2-fpm-alpine
+FROM php:${PHP_IMAGE_TAG}

-FROM php:${PHP_VERSION}-fpm-alpine
-
-LABEL maintainer="Samuel Laulhau <sam@lalop.co>, Holger Lösken <holger.loesken@codedge.de>"
+LABEL maintainer="Samuel Laulhau <sam@lalop.co>"

 #####
 # SYSTEM REQUIREMENT
 #####
-ARG INVOICENINJA_VERSION
-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
+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
+    

-RUN set -eux; \
-    apk add --no-cache \
-    gmp-dev \
-    freetype-dev \
-    libarchive-tools \
-    libjpeg-turbo-dev \
-    libpng-dev \
-    libwebp-dev\ 
-    libzip-dev
+# 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 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
+#####
+# DOWNLOAD AND INSTALL INVOICE NINJA
+#####

-COPY ./config/php/php.ini /usr/local/etc/php/php.ini
-COPY ./config/php/php-cli.ini /usr/local/etc/php/php-cli.ini
+ENV INVOICENINJA_VERSION 4.5.14

-# 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 \
+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 \
-    && cp /var/www/app/.env.example /var/www/app/.env \
+    && 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,95 +0,0 @@
-ARG PHP_VERSION=7.3
-
-# Get Invoice Ninja
-FROM alpine:latest as base
-ARG INVOICENINJA_VERSION
-
-RUN set -eux; \
-    apk add --no-cache \
-    curl \
-    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 set -eux; \
-    apk add --no-cache \
-    freetype-dev \
-    gmp-dev \
-    libjpeg-turbo-dev \
-    libpng-dev \
-    libzip-dev; \
-    docker-php-ext-configure zip --with-libzip; \
-    docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-png-dir=/usr/include/; \
-    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
-
-## 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; \
-    composer global require hirak/prestissimo;
-
-USER $INVOICENINJA_USER
-
-RUN composer install --no-dev --no-suggest --no-progress
-
-# Override the environment settings from projects .env file
-ENV APP_ENV production
-ENV LOG errorlog
-
-ENTRYPOINT ["docker-entrypoint"]
-CMD ["php-fpm"]
--- 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/php/php-cli.ini
+++ b/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
--- a/config/php/php.ini
+++ b/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
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,92 +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
-    environment: 
-      - APP_URL=https://localhost
-      - APP_KEY=<INSERT THE GENERATED APPLICATION KEY HERE>
-      - MULTI_DB_ENABLED=false
-      - DB_HOST1=db
-    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=db-ninja-01
-    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
-
- 
-  # cron:
-  #   image: invoiceninja/invoiceninja
-  #   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:
-  #     - invoiceninja
-
-volumes:
-  mysql-data:
-  public:
-  storage:
-
-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/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,103 +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 "$@"
-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
+	cp -Rp /var/www/app/docker-backup-storage /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
+	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 ] && [ -d $BAK_LOGO_PATH ]; then
-    cp -Rp $BAK_LOGO_PATH /var/www/app/public/logo
+if [ ! -d /var/www/app/public/logo ]; then
+	cp -Rp /var/www/app/docker-backup-public/logo /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
+	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
-    cp -au /var/www/app/docker-backup-public/* /var/www/app/public/
-    echo $INVOICENINJA_VERSION > /var/www/app/public/version
+  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

-# 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
+# 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_PASSWORD'
-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
+#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 "$@"