2.9.1

Use php7.0 instead of latest. (Closes #23)

.gitignore

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

Dockerfile

@@ -1,11 +1,18 @@
-FROM php:fpm
+FROM php:7.0-fpm
+
+MAINTAINER Samuel Laulhau <sam@lalop.co>
 
 #####
 # SYSTEM REQUIREMENT
 #####
 RUN apt-get update \
-    && apt-get install -y libmcrypt-dev zlib1g-dev git\
+    && apt-get install -y --no-install-recommends \
-    && docker-php-ext-install iconv mcrypt mbstring pdo pdo_mysql zip \
+        libmcrypt-dev zlib1g-dev git libgmp-dev \
+        libfreetype6-dev libjpeg62-turbo-dev libpng12-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 \
     && rm -rf /var/lib/apt/lists/*
 
 #####
@@ -15,19 +22,21 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local
 
 
 #####
-# DOWNLOAD AND INSTALL INVOICE NONJA
+# DOWNLOAD AND INSTALL INVOICE NINJA
 #####
 
-ENV INVOICENINJA_VERSION 2.4.4
+ENV INVOICENINJA_VERSION 2.9.1
-#ENV INVOICENINJA_SHA1 3e9b63c1681b6923dc1a24399411c1abde6ef5ea
 
 RUN curl -o invoiceninja.tar.gz -SL https://github.com/hillelcoren/invoice-ninja/archive/v${INVOICENINJA_VERSION}.tar.gz \
-#    && echo "$INVOICENINJA_SHA1 *invoiceninja.tar.gz" | sha1sum -c - \
     && 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
+    && 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
 
 
 ######
@@ -38,6 +47,8 @@ ENV DB_DATABASE ninja
 ENV APP_KEY SomeRandomString
 ENV LOG errorlog
 ENV APP_DEBUG 0
+ENV APP_CIPHER rijndael-128
+ENV SELF_UPDATER_SOURCE ''
 
 
 #use to be mounted into nginx for exemple

README.md

@@ -1,3 +1,8 @@
 DockerFile for invoice ninja (https://www.invoiceninja.com/)
 
-To test Invoice Ninja you can copy docker-compose.yml, remove the volume linked which can cause some troubles if you use docker on Mac, and run it.
+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.
+
+To make your data persistent, you have to mount `/var/www/app/public/logo` and `/var/www/app/storage`.

app-entrypoint.sh

@@ -12,6 +12,58 @@ fi
 echo "DB_USERNAME=$DB_USERNAME" >> .env
 echo "DB_PASSWORD=$DB_PASSWORD" >> .env
 
-chown www-data .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.yml

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

example/docker-compose.yml

@@ -0,0 +1,46 @@
+version: "2"
+
+services:
+  db:
+    image: mysql
+    environment:
+      MYSQL_DATABASE: ninja
+      MYSQL_ROOT_PASSWORD: pwd
+
+  app:
+    image: invoiceninja/invoiceninja
+    links:
+      - db:mysql
+    environment:
+      APP_DEBUG: 1
+      DB_USERNAME: root
+      DB_PASSWORD: pwd
+
+  web:
+    image: nginx
+    volumes:
+      - ./nginx.conf:/etc/nginx/nginx.conf:ro
+    links:
+      - app
+    volumes_from:
+      - app
+    ports:
+      - 80
+
+  cron:
+    image: invoiceninja/invoiceninja
+    links:
+      - db:mysql
+    user: www-data
+    environment:
+      APP_DEBUG: 1
+    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
+      done
+      EOF'