2.9.1

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

.gitignore

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

Dockerfile

@@ -1,4 +1,4 @@
-FROM php:fpm
+FROM php:7.0-fpm
 
 MAINTAINER Samuel Laulhau <sam@lalop.co>
 
@@ -25,7 +25,7 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local
 # DOWNLOAD AND INSTALL INVOICE NINJA
 #####
 
-ENV INVOICENINJA_VERSION 2.7.2
+ENV INVOICENINJA_VERSION 2.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/ \
@@ -34,6 +34,7 @@ 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
 

README.md

@@ -2,6 +2,7 @@ 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 by cloning this repos and run `docker-compose run`.
+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 persistant, you have to mount `/var/www/app/public/logo` and `/var/www/app/storage`.
+To make your data persistent, you have to mount `/var/www/app/public/logo` and `/var/www/app/storage`.

app-entrypoint.sh

@@ -35,8 +35,35 @@ else
 fi
 
 chown www-data:www-data /var/www/app/.env
-# php artisan optimize --force
-# php artisan migrate --force
-# php artisan db:seed --class=UpdateSeeder
 
+# 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,39 +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
-
-cron:
-  image: invoiceninja/invoiceninja
-  links:
-    - db:mysql
-  user: www-data
-  entrypoint: |
-    bash -c 'bash -s <<EOF
-    trap "break;exit" SIGHUP SIGINT SIGTERM
-    sleep 30s
-    while /bin/true; do
-      DB_USERNAME=root DB_PASSWORD=mdp /usr/local/bin/php /var/www/app/artisan ninja:send-invoices
-      DB_USERNAME=root DB_PASSWORD=mdp /usr/local/bin/php /var/www/app/artisan ninja:send-reminders
-      sleep 1d
-    done
-    EOF'

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'