3.5.1

This reverts commit 17759c3df7.

.gitignore

@@ -1 +0,0 @@
-data

Dockerfile

@@ -1,19 +1,38 @@
-FROM php:fpm
+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 \
+    && 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 2.6.8
+ENV INVOICENINJA_VERSION 3.5.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/ \
@@ -35,7 +54,8 @@ RUN curl -o invoiceninja.tar.gz -SL https://github.com/hillelcoren/invoice-ninja
     && 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/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
 
 
 ######
@@ -43,10 +63,14 @@ RUN curl -o invoiceninja.tar.gz -SL https://github.com/hillelcoren/invoice-ninja
 ######
 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
@@ -54,9 +78,7 @@ VOLUME /var/www/app/public
 
 WORKDIR /var/www/app
 
-EXPOSE 80
+COPY entrypoint.sh /entrypoint.sh
-
-COPY app-entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh
 
 ENTRYPOINT ["/entrypoint.sh"]

README.md

@@ -2,30 +2,36 @@ DockerFile for invoice ninja (https://www.invoiceninja.com/)
 
 This image is based on `php:7` official version.
 
-The easiest way to try this image is via docker compose :
+The easiest way to test Invoice Ninja with docker is by copying the example directory, run `docker-compose up` and visit http://localhost:8000/ .
+
+To make your data persistent, you have to mount `/var/www/app/public/logo` and `/var/www/app/storage`.
+
+All the supported environment variable can be found here https://github.com/invoiceninja/invoiceninja/blob/master/.env.example
+
+
+### Usage
+
+To run it:
 
 ```
-db:
+docker run -d
-  image: mysql
+  -e APP_ENV='production'
-  environment:
+  -e APP_DEBUG=0
-    MYSQL_DATABASE: ninja
+  -e APP_URL='http://ninja.dev'
-    MYSQL_ROOT_PASSWORD: mdp
+  -e APP_KEY='SomeRandomStringSomeRandomString'
-
+  -e APP_CIPHER='AES-256-CBC'
-app:
+  -e DB_TYPE='mysql'
-  image: invoiceninja/invoiceninja
+  -e DB_STRICT='false'
-  links:
+  -e DB_HOST='localhost'
-    - db:mysql
+  -e DB_DATABASE='ninja'
-
+  -e DB_USERNAME='ninja'
-web:
+  -e DB_PASSWORD='ninja'
-  image: nginx
+  -p '80:80'
-  volumes:
+  invoiceninja/invoiceninja
-    - ./nginx.conf:/etc/nginx/nginx.conf:ro
-  links:
-    - app
-  volumes_from:
-    - app
-  ports:
-    - 80
 ```
+A list of environment variables can be found [here](https://github.com/invoiceninja/invoiceninja/blob/master/.env.example)
 
-To make your data persistant, you have to mount `/var/www/app/public/logo` and `/var/www/app/storage`.
+
+### 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 3.5.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 /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,39 +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
-
-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 .env
-
-exec "$@"

docker-compose.yml

@@ -1,23 +0,0 @@
-db:
-  image: mysql
-  environment:
-    MYSQL_DATABASE: ninja
-    MYSQL_ROOT_PASSWORD: mdp
-
-app:
-  image: invoiceninja/invoiceninja
-  links:
-    - db:mysql
-  environment:
-    APP_DEBUG: 1
-
-web:
-  image: nginx
-  volumes:
-    - ./nginx.conf:/etc/nginx/nginx.conf:ro
-  links:
-    - app
-  volumes_from:
-    - app
-  ports:
-    - 80

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 "$@"

example/.env

@@ -0,0 +1,13 @@
+
+
+APP_DEBUG=1
+APP_URL=http://localhost:8000
+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

@@ -0,0 +1,43 @@
+version: "2"
+
+services:
+  db:
+    image: mysql
+    environment:
+      MYSQL_DATABASE: ninja
+      MYSQL_ROOT_PASSWORD: pwd
+
+  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'