3.0.0

Enable additional SMTP env variables

.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.6.6
+ENV INVOICENINJA_VERSION 3.0.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,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
 
@@ -46,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

@@ -2,30 +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 via docker compose :
+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`.
-db:
-  image: mysql
-  environment:
-    MYSQL_DATABASE: ninja
-    MYSQL_ROOT_PASSWORD: mdp
-
-app:
-  image: invoiceninja/invoiceninja
-  links:
-    - db:mysql
-
-web:
-  image: nginx
-  volumes:
-    - ./nginx.conf:/etc/nginx/nginx.conf:ro
-  links:
-    - app
-  volumes_from:
-    - app
-  ports:
-    - 80
-```
-
-To make your data persistant, you have to mount `/var/www/app/public/logo` and `/var/www/app/storage`.

app-entrypoint.sh

@@ -11,6 +11,14 @@ 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
@@ -34,6 +42,36 @@ else
 	done
 fi
 
-chown www-data .env
+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 "$@"

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'