From f297a2affd775efce51ed684c03128dd6cda22e2 Mon Sep 17 00:00:00 2001
From: WilliamMiceli <9000802+WilliamMiceli@users.noreply.github.com>
Date: Thu, 29 Mar 2018 15:18:11 -0400
Subject: [PATCH] Testing

---
 templates/invoice-ninja/0/docker-compose.yml  | 29 +++++++++----------
 templates/invoice-ninja/0/rancher-compose.yml |  4 +--
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/templates/invoice-ninja/0/docker-compose.yml b/templates/invoice-ninja/0/docker-compose.yml
index ea30017..c7df3cd 100644
--- a/templates/invoice-ninja/0/docker-compose.yml
+++ b/templates/invoice-ninja/0/docker-compose.yml
@@ -6,10 +6,10 @@ services:
       - db
     labels:
       io.rancher.scheduler.affinity:host_label: ${HOST_LABEL_KEY}=${HOST_LABEL_VALUE}
-      io.rancher.sidekicks: cron, db, web
+      io.rancher.sidekicks: cron
     networks:
       - ninja-net
-    restart: always
+    restart: on-failure
     volumes:
       - ${VOLUME_LOGO}:/var/www/app/public/logo:nocopy
       - ${VOLUME_STORAGE}:/var/www/app/storage:nocopy
@@ -29,15 +29,19 @@ services:
       io.rancher.scheduler.affinity:host_label: ${HOST_LABEL_KEY}=${HOST_LABEL_VALUE}
     networks:
       - ninja-net
+    restart: on-failure
     volumes_from:
       - app
   db:
     image: mysql
+    environment:
+      - MYSQL_ROOT_PASSWORD='test123456'
+      - MYSQL_DATABASE='ninja'
     labels:
       io.rancher.scheduler.affinity:host_label: ${HOST_LABEL_KEY}=${HOST_LABEL_VALUE}
-    restart: always
+    restart: on-failure
     volumes:
-      - ${VOLUME_DATA}:/var/lib/mysql:nocopy
+      - ${VOLUME_DB}:/var/lib/mysql:nocopy
   web:
     image: nginx
     depends_on:
@@ -47,7 +51,8 @@ services:
     networks:
       - ninja-net
     ports:
-      - "8000:80"
+      - "8000:8000"
+    retart: on-failure
     volumes:
       - ${VOLUME_WEB}:/etc/nginx:nocopy
     volumes_from:
@@ -58,19 +63,11 @@ environment:
   - APP_URL=${APP_URL}
   - APP_KEY=${APP_KEY}
   - APP_CIPHER='AES-256-CBC'
-  - DB_HOST='mysql'
+  - DB_HOST='db'
   - DB_STRICT='false'
   - DB_TYPE='mysql'
-  - DB_USERNAME='ninja'
-  - DB_PASSWORD='pwd'
-  - MAIL_HOST='mail.service.host'
-  - MAIL_DRIVER='smtp'
-  - MAIL_FROM_ADDRESS='user@mail.com'
-  - MAIL_FROM_NAME='My name'
-  - MAIL_USERNAME='username'
-  - MAIL_PASSWORD='password'
-  - MYSQL_DATABASE='ninja'
-  - MYSQL_ROOT_PASSWORD='pwd'
+  - DB_USERNAME='root'
+  - DB_PASSWORD='test123456'
 networks:
   ninja-net:
 volumes_driver: rancher-nfs
\ No newline at end of file
diff --git a/templates/invoice-ninja/0/rancher-compose.yml b/templates/invoice-ninja/0/rancher-compose.yml
index 0b79951..e119ef2 100644
--- a/templates/invoice-ninja/0/rancher-compose.yml
+++ b/templates/invoice-ninja/0/rancher-compose.yml
@@ -32,11 +32,11 @@ catalog:
       default: "InvoiceNinja-Storage"
       required: true
       type: string
-    - variable: "VOLUME_DATA"
+    - variable: "VOLUME_DB"
       label: "Persistent Data Volume"
       description: |
         The volume name that should be used for persistent storage
-      default: "InvoiceNinja-Data"
+      default: "InvoiceNinja-DB"
       required: true
       type: string
     - variable: "VOLUME_WEB"