From 9b649269c78aea827ebcc79536191fe55805aa36 Mon Sep 17 00:00:00 2001
From: Sam <sam@lalop.co>
Date: Thu, 29 Sep 2016 08:29:34 +0200
Subject: [PATCH] docker compose v2

---
 .gitignore                       |  1 -
 README.md                        |  3 ++-
 docker-compose.yml               | 39 ---------------------------
 exemple/docker-compose.yml       | 46 ++++++++++++++++++++++++++++++++
 nginx.conf => exemple/nginx.conf |  0
 5 files changed, 48 insertions(+), 41 deletions(-)
 delete mode 100644 .gitignore
 delete mode 100644 docker-compose.yml
 create mode 100644 exemple/docker-compose.yml
 rename nginx.conf => exemple/nginx.conf (100%)

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 1269488..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-data
diff --git a/README.md b/README.md
index b812869..211ea45 100644
--- a/README.md
+++ b/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 exemple directory and run `docker-compe 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`.
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index 57c2f1d..0000000
--- a/docker-compose.yml
+++ /dev/null
@@ -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 300s
-    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'
diff --git a/exemple/docker-compose.yml b/exemple/docker-compose.yml
new file mode 100644
index 0000000..e06f29f
--- /dev/null
+++ b/exemple/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'
diff --git a/nginx.conf b/exemple/nginx.conf
similarity index 100%
rename from nginx.conf
rename to exemple/nginx.conf