4.2.0

This reverts commit 17759c3df7.

Dockerfile

@@ -5,15 +5,34 @@ 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 \
+    && 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
@@ -25,7 +44,7 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local
 # DOWNLOAD AND INSTALL INVOICE NINJA
 #####
 
-ENV INVOICENINJA_VERSION 3.0.2
+ENV INVOICENINJA_VERSION 4.2.0
 
 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/ \
@@ -34,21 +53,17 @@ RUN curl -o invoiceninja.tar.gz -SL https://github.com/hillelcoren/invoice-ninja
     && 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 \
-    # && echo ${INVOICENINJA_VERSION} > /var/www/app/storage/version.txt \
     && mv /var/www/app/storage /var/www/app/docker-backup-storage \
-    && mv /var/www/app/public/logo /var/www/app/docker-backup-public-logo
+    && 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 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
@@ -56,9 +71,7 @@ VOLUME /var/www/app/public
 
 WORKDIR /var/www/app
 
-EXPOSE 80
-
-COPY app-entrypoint.sh /entrypoint.sh
+COPY entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh
 
 ENTRYPOINT ["/entrypoint.sh"]

README.md

@@ -1,8 +1,40 @@
 DockerFile for invoice ninja (https://www.invoiceninja.com/)
 
-This image is based on `php:7` official version.
-
-The easiest way to test Invoice Ninja with docker is by copying the example directory and run `docker-compose up`.
-The first launch could be slow because we create all tables and seed the database, but once youe see `NOTICE: ready to handle connections` all is ready.
+This image is based on `php:7.0-fpm` official version.
 
 To make your data persistent, you have to mount `/var/www/app/public/logo` and `/var/www/app/storage`.
+
+
+### Usage
+
+To run it:
+
+```
+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)
+
+
+### 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

alpine/Dockerfile

@@ -0,0 +1,83 @@
+FROM php:7.0-fpm-alpine
+
+MAINTAINER Samuel Laulhau <sam@lalop.co>
+
+#####
+# 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 4.2.0
+
+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 /usr/local/bin/invoice-entrypoint
+# RUN chmod +x /usr/local/bin/invoice-entrypoint
+
+ENTRYPOINT ["invoice-entrypoint"]
+CMD ["php-fpm"]

alpine/entrypoint.sh

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

app-entrypoint.sh

@@ -1,77 +0,0 @@
-#!/bin/bash
-set -e
-
-
-# if we're linked to MySQL, and we're using the root user, and our linked
-# container has a default "root" password set up and passed through... :)
-: ${DB_USERNAME:=root}
-if [ "$DB_USERNAME" = 'root' ]; then
-	: ${DB_PASSWORD:=$MYSQL_ENV_MYSQL_ROOT_PASSWORD}
-fi
-
-echo "DB_USERNAME=$DB_USERNAME" >> .env
-echo "DB_PASSWORD=$DB_PASSWORD" >> .env
-echo "DB_HOST=$DB_HOST" >> .env
-echo "MAIL_DRIVER=$MAIL_DRIVER" >> .env
-echo "MAIL_PORT=$MAIL_PORT" >> .env
-echo "MAIL_HOST=$MAIL_HOST" >> .env
-echo "MAIL_USERNAME=$MAIL_USERNAME" >> .env
-echo "MAIL_PASSWORD=$MAIL_PASSWORD" >> .env
-echo "MAIL_FROM_ADDRESS=$MAIL_FROM_ADDRESS" >> .env
-echo "MAIL_FROM_NAME=$MAIL_FROM_NAME" >> .env
-
-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
-
-chown www-data:www-data /var/www/app/.env
-
-# widely inspired from https://github.com/docker-library/wordpress/blob/c674e9ceedf582705e0ad8487c16b42b37a5e9da/fpm/docker-entrypoint.sh#L128
-TERM=dumb php -- "$DB_HOST" "$DB_USERNAME" "$DB_PASSWORD" "$DB_DATABASE" <<'EOPHP'
-<?php
-$stderr = fopen('php://stderr', 'w');
-list($host, $port) = explode(':', $argv[1], 2);
-$maxTries = 20;
-do {
-	try {
-		$connection = new Pdo("mysql:dbname={$argv[4]};host={$host};port={$port}", $argv[2], $argv[3]);
-		fwrite($stderr, 'MySQL ready'. "\n");
-		exit(0);
-	} catch (PDOException $e) {
-    fwrite($stderr, 'MySQL Connection Error: ' . $e->getMessage(). "\n");
-		if (--$maxTries <= 0) {
-			exit(1);
-		}
-		sleep(3);
-	}
-} while (true);
-EOPHP
-
-#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 "$@"

docker-compose/.env.example

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

docker-compose/docker-compose.yml

@@ -3,18 +3,20 @@ version: "2"
 services:
   db:
     image: mysql
-    environment:
-      MYSQL_DATABASE: ninja
-      MYSQL_ROOT_PASSWORD: pwd
+    env_file: .env
+    restart: always
+    volumes:
+      - ./srv/invoiceninja/mysql:/var/lib/mysql
 
   app:
     image: invoiceninja/invoiceninja
     links:
       - db:mysql
-    environment:
-      APP_DEBUG: 1
-      DB_USERNAME: root
-      DB_PASSWORD: pwd
+    env_file: .env
+    restart: always
+    volumes:
+      - ./srv/invoiceninja/storage:/var/www/app/storage:rw
+      - ./srv/invoiceninja/logo:/var/www/app/public/logo:rw
 
   web:
     image: nginx
@@ -25,22 +27,23 @@ services:
     volumes_from:
       - app
     ports:
-      - 80
+      - 8000:80
 
   cron:
     image: invoiceninja/invoiceninja
     links:
       - db:mysql
-    user: www-data
-    environment:
-      APP_DEBUG: 1
+    env_file: .env
+    volumes_from:
+      - app
     entrypoint: |
       bash -c 'bash -s <<EOF
       trap "break;exit" SIGHUP SIGINT SIGTERM
       sleep 300s
       while /bin/true; do
-        DB_USERNAME=root DB_PASSWORD=pwd /usr/local/bin/php /var/www/app/artisan ninja:send-invoices
-        DB_USERNAME=root DB_PASSWORD=pwd /usr/local/bin/php /var/www/app/artisan ninja:send-reminders
-        sleep 1d
+        ./artisan ninja:send-invoices
+        ./artisan ninja:send-reminders
+        sleep 1h
       done
       EOF'
+      

entrypoint.sh

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