From 03aa631f31b3b36def0259b167e11fe541af138c Mon Sep 17 00:00:00 2001 From: WilliamMiceli <9000802+WilliamMiceli@users.noreply.github.com> Date: Tue, 20 Mar 2018 22:18:25 -0400 Subject: [PATCH] Testing --- templates/invoice-ninja/0/docker-compose.yml | 6 +----- templates/invoice-ninja/0/rancher-compose.yml | 7 +++++++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/templates/invoice-ninja/0/docker-compose.yml b/templates/invoice-ninja/0/docker-compose.yml index 790ccd8..6c7f9e6 100644 --- a/templates/invoice-ninja/0/docker-compose.yml +++ b/templates/invoice-ninja/0/docker-compose.yml @@ -48,8 +48,6 @@ services: - DB_PASSWORD=${DB_PASSWORD} links: - db:mysql - volumes_from: - - invoiceninja db: image: mysql environment: @@ -74,7 +72,5 @@ services: ports: - 8000:80 volumes: - - ./nginx.conf:/etc/nginx/nginx.conf:ro - volumes_from: - - invoiceninja + - ${VOLUME_WEB}:/etc/nginx/nginx.conf:ro 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 3e061c0..d8a9750 100644 --- a/templates/invoice-ninja/0/rancher-compose.yml +++ b/templates/invoice-ninja/0/rancher-compose.yml @@ -39,6 +39,13 @@ catalog: default: "InvoiceNinja-Data" required: true type: string + - variable: "VOLUME_WEB" + label: "Persistent Web Server Storage Volume" + description: | + The volume name that should be used for persistent storage + default: "InvoiceNinja-Data" + required: true + type: string - variable: "DB_DATABASE" label: "Name of the database" description: |