3.3.3

Issue #45: Rename the entrypoint script to make it a bit cleaner.

Dockerfile

@@ -15,13 +15,24 @@ RUN apt-get update \
     && 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
@@ -33,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.5
+ENV INVOICENINJA_VERSION 3.3.3
 
 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/ \
@@ -42,9 +53,9 @@ 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
 
 
 ######
@@ -67,7 +78,7 @@ VOLUME /var/www/app/public
 
 WORKDIR /var/www/app
 
-COPY app-entrypoint.sh /entrypoint.sh
+COPY entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh
 
 ENTRYPOINT ["/entrypoint.sh"]

README.md

@@ -3,7 +3,6 @@ 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, run `docker-compose up` and visit http://localhost:8000/ .
-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.
 
 To make your data persistent, you have to mount `/var/www/app/public/logo` and `/var/www/app/storage`.
 

alpine/Dockerfile

@@ -0,0 +1,93 @@
+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
+RUN apk add libmcrypt-dev
+# RUN apk add zlib1g-dev
+RUN apk add git
+RUN apk add gmp-dev
+RUN apk add freetype-dev
+RUN apk add libjpeg-turbo-dev
+RUN apk add libpng-dev
+RUN apk add coreutils
+RUN apk add chrpath 
+# RUN apk add libssl-dev 
+# RUN apk add libxft-dev \
+        # libfreetype6 libfontconfig1 libfontconfig1-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 \
+    && 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/* \
+    && echo "php_admin_value[error_reporting] = E_ALL & ~E_NOTICE & ~E_WARNING & ~E_STRICT & ~E_DEPRECATED">>/usr/local/etc/php-fpm.d/www.conf
+
+# 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.3.3
+
+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,56 +0,0 @@
-#!/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
-
-# 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 "$@"

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/docker-compose.yml

@@ -24,20 +24,20 @@ services:
     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'
+  # 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'