Merge pull request #213 from turbo124/master

Add Git / link storage

.editorconfig

@@ -0,0 +1,24 @@
+# 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
+

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,26 @@
+---
+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 ?

.github/workflows/build_push.yml

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

CODE_OF_CONDUCT.md

@@ -0,0 +1,76 @@
+# 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

Dockerfile

@@ -1,85 +0,0 @@
-FROM php:7.0-fpm
-
-MAINTAINER Samuel Laulhau <sam@lalop.co>
-
-#####
-# SYSTEM REQUIREMENT
-#####
-ENV PHANTOMJS phantomjs-2.1.1-linux-x86_64
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends \
-        libmcrypt-dev zlib1g-dev git libgmp-dev \
-        libfreetype6-dev libjpeg62-turbo-dev libpng12-dev \
-        build-essential chrpath libssl-dev libxft-dev \
-        libfreetype6 libfontconfig1 libfontconfig1-dev \
-    && 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 mcrypt mbstring pdo pdo_mysql zip gd gmp opcache \
-    && 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
-
-#####
-# INSTALL COMPOSER
-#####
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-
-
-#####
-# DOWNLOAD AND INSTALL INVOICE NINJA
-#####
-
-ENV INVOICENINJA_VERSION 3.9.1
-
-RUN curl -o invoiceninja.tar.gz -SL https://github.com/hillelcoren/invoice-ninja/archive/v${INVOICENINJA_VERSION}.tar.gz \
-    && tar -xzf invoiceninja.tar.gz -C /var/www/ \
-    && rm invoiceninja.tar.gz \
-    && mv /var/www/invoiceninja-${INVOICENINJA_VERSION} /var/www/app \
-    && chown -R www-data:www-data /var/www/app \
-    && composer install --working-dir /var/www/app -o --no-dev --no-interaction --no-progress \
-    && chown -R www-data:www-data /var/www/app/bootstrap/cache \
-    && mv /var/www/app/storage /var/www/app/docker-backup-storage \
-    && mv /var/www/app/public /var/www/app/docker-backup-public \
-    && rm -rf /var/www/app/docs /var/www/app/tests
-
-
-######
-# DEFAULT ENV
-######
-ENV DB_HOST mysql
-ENV DB_DATABASE ninja
-ENV DB_USERNAME ninja
-ENV DB_PASSWORD ninja
-ENV APP_KEY SomeRandomString
-ENV LOG errorlog
-ENV APP_DEBUG 0
-ENV APP_CIPHER rijndael-128
-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
-RUN chmod +x /entrypoint.sh
-
-ENTRYPOINT ["/entrypoint.sh"]
-CMD ["php-fpm"]

Makefile

@@ -0,0 +1,58 @@
+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,37 +1,20 @@
-DockerFile for invoice ninja (https://www.invoiceninja.com/)
+![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)
 
-This image is based on `php:7` official version.
+# Docker for [Invoice Ninja](https://www.invoiceninja.com/) 
 
-The easiest way to test Invoice Ninja with docker is by copying the example directory, run `docker-compose up` and visit http://localhost:8000/ .
+: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.
 
-To make your data persistent, you have to mount `/var/www/app/public/logo` and `/var/www/app/storage`.
+:crown: **Features**
 
-All the supported environment variable can be found here https://github.com/invoiceninja/invoiceninja/blob/master/.env.example
+:lock: Automatic HTTPS (:heart: [Caddy](https://caddyserver.com/))  
+:hammer: Fully production-ready through docker-compose  
+:pencil: Adjustable to your needs via environment variable  
 
 
-### Usage
+## Documentation
 
-To run it:
+Please see our [wiki](https://github.com/invoiceninja/dockerfiles/wiki) for further guidance.
 
-```
-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
-```
-A list of environment variables can be found [here](https://github.com/invoiceninja/invoiceninja/blob/master/.env.example)
-
-
-### Know issue
-
-Phantomjs doesn't work on linux alpine https://github.com/ariya/phantomjs/issues/14186

alpine/Dockerfile

@@ -1,83 +1,78 @@
-FROM php:7.0-fpm-alpine
+ARG PHP_VERSION=7.2
 
-MAINTAINER Samuel Laulhau <sam@lalop.co>
+FROM php:${PHP_VERSION}-fpm-alpine
+
+LABEL maintainer="Samuel Laulhau <sam@lalop.co>, Holger Lösken <holger.loesken@codedge.de>"
 
 #####
 # SYSTEM REQUIREMENT
 #####
-ENV PHANTOMJS phantomjs-2.1.1-linux-x86_64
-RUN apk update \
- && apk add --no-cache libmcrypt-dev git gmp-dev freetype-dev libjpeg-turbo-dev \
-            coreutils chrpath fontconfig libpng-dev
-
-RUN 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 mcrypt 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
-    
-
-# 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
-
-#####
-# INSTALL COMPOSER
-#####
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-
-
-#####
-# DOWNLOAD AND INSTALL INVOICE NINJA
-#####
-
-ENV INVOICENINJA_VERSION 3.9.1
-
-RUN curl -o invoiceninja.tar.gz -SL https://github.com/hillelcoren/invoice-ninja/archive/v${INVOICENINJA_VERSION}.tar.gz \
-    && tar -xzf invoiceninja.tar.gz -C /var/www/ \
-    && rm invoiceninja.tar.gz \
-    && mv /var/www/invoiceninja-${INVOICENINJA_VERSION} /var/www/app \
-    && chown -R www-data:www-data /var/www/app \
-    && composer install --working-dir /var/www/app -o --no-dev --no-interaction --no-progress \
-    && chown -R www-data:www-data /var/www/app/bootstrap/cache \
-    && mv /var/www/app/storage /var/www/app/docker-backup-storage \
-    && mv /var/www/app/public /var/www/app/docker-backup-public \
-    && rm -rf /var/www/app/docs /var/www/app/tests
-
-
-######
-# DEFAULT ENV
-######
-ENV DB_HOST mysql
-ENV DB_DATABASE ninja
-ENV DB_USERNAME ninja
-ENV DB_PASSWORD ninja
-ENV APP_KEY SomeRandomString
-ENV LOG errorlog
-ENV APP_DEBUG 0
-ENV APP_CIPHER rijndael-128
-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
-
+ARG INVOICENINJA_VERSION
 WORKDIR /var/www/app
 
-COPY entrypoint.sh /usr/local/bin/invoice-entrypoint
-# RUN chmod +x /usr/local/bin/invoice-entrypoint
+COPY entrypoint.sh /usr/local/bin/docker-entrypoint
+RUN chmod +x /usr/local/bin/docker-entrypoint
 
-ENTRYPOINT ["invoice-entrypoint"]
-CMD ["php-fpm"]
+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

@@ -0,0 +1,125 @@
+ARG PHP_VERSION=7.3
+
+# 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 set -eux; \
+    apk add --no-cache \
+    nodejs \
+    npm \
+    mysql-client \
+    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
+
+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 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"]

alpine/entrypoint.sh

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

config/caddy/Caddyfile

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

config/cron/cronjob_v5.sh

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

config/nginx/in-vhost.conf

@@ -0,0 +1,25 @@
+server {
+    listen 80 default_server;
+    server_name in.localhost;
+
+    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;
+    }
+}

config/php/php-cli.ini

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

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

docker-compose.yml

@@ -0,0 +1,99 @@
+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:

entrypoint.sh

@@ -1,42 +1,108 @@
-#!/bin/bash
+#!/usr/bin/env 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
+# 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
 
-if [ ! -d /var/www/app/public/logo ]; then
-	cp -Rp /var/www/app/docker-backup-public/logo /var/www/app/public/logo
+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
-	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
+    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
-  echo 'clone public directory'
-  cp -Rp /var/www/app/docker-backup-public/* /var/www/app/public/
-  echo $INVOICENINJA_VERSION > /var/www/app/public/version
+    cp -au /var/www/app/docker-backup-public/* /var/www/app/public/
+    echo $INVOICENINJA_VERSION > /var/www/app/public/version
 fi
 
-#php artisan optimize --force
-#php artisan migrate --force
+# 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
 
-#if [ ! -e "/var/www/app/is-seeded" ]; then
-	#php artisan db:seed --force
-	#touch "/var/www/app/is-seeded"
-#fi
+# 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'
 
-echo 'start'
-exec "$@"
+# Run Laravel stuff
+php artisan config:cache
+php artisan optimize
+
+exec docker-php-entrypoint "$@"

example/.env

@@ -1,15 +0,0 @@
-
-
-APP_DEBUG=1
-APP_URL=http://localhost:8000
-APP_KEY=SomeRandomStringSomeRandomString
-APP_CIPHER=AES-256-CBC
-DB_USERNAME=root
-DB_PASSWORD=pwd
-DB_HOST=mysql
-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

example/docker-compose.yml

@@ -1,45 +0,0 @@
-version: "2"
-
-services:
-  db:
-    image: mysql
-    environment:
-      MYSQL_DATABASE: ninja
-      MYSQL_ROOT_PASSWORD: pwd
-    volumes:
-      - ./var/mysql:/var/lib/mysql
-
-  app:
-    image: invoiceninja/invoiceninja
-    links:
-      - db:mysql
-    env_file: .env
-
-  web:
-    image: nginx
-    volumes:
-      - ./nginx.conf:/etc/nginx/nginx.conf:ro
-    links:
-      - app
-    volumes_from:
-      - app
-    ports:
-      - 8000:80
-
-  # cron:
-  #   image: invoiceninja/invoiceninja
-  #   links:
-  #     - db:mysql
-  #   env_file: .env
-  #   volumes_from:
-  #     - app
-  #   entrypoint: |
-  #     bash -c 'bash -s <<EOF
-  #     trap "break;exit" SIGHUP SIGINT SIGTERM
-  #     sleep 300s
-  #     while /bin/true; do
-  #       /usr/local/bin/php /var/www/app/artisan ninja:send-invoices
-  #       /usr/local/bin/php /var/www/app/artisan ninja:send-reminders
-  #       sleep 1d
-  #     done
-  #     EOF'

example/nginx.conf

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