Changed to explicit environment variables, not from file
This commit is contained in:
@@ -2,7 +2,18 @@ version: '2'
|
|||||||
services:
|
services:
|
||||||
invoiceninja:
|
invoiceninja:
|
||||||
image: invoiceninja/invoiceninja
|
image: invoiceninja/invoiceninja
|
||||||
env_file: .env
|
environment:
|
||||||
|
- APP_ENV='production'
|
||||||
|
- APP_DEBUG=0
|
||||||
|
- APP_URL='http://ninja.dev'
|
||||||
|
-e APP_KEY=${APP_KEY}
|
||||||
|
-e APP_CIPHER='AES-256-CBC'
|
||||||
|
-e DB_TYPE='mysql'
|
||||||
|
-e DB_STRICT='false'
|
||||||
|
-e DB_HOST='localhost'
|
||||||
|
-e DB_DATABASE=${DB_DATABASE}
|
||||||
|
-e DB_USERNAME=${DB_USERNAME}
|
||||||
|
-e DB_PASSWORD=${DB_PASSWORD}
|
||||||
labels:
|
labels:
|
||||||
io.rancher.scheduler.affinity:host_label: ${HOST_LABEL_KEY}=${HOST_LABEL_VALUE}
|
io.rancher.scheduler.affinity:host_label: ${HOST_LABEL_KEY}=${HOST_LABEL_VALUE}
|
||||||
links:
|
links:
|
||||||
@@ -23,14 +34,36 @@ services:
|
|||||||
sleep 1h
|
sleep 1h
|
||||||
done
|
done
|
||||||
EOF'
|
EOF'
|
||||||
env_file: .env
|
environment:
|
||||||
|
- APP_ENV='production'
|
||||||
|
- APP_DEBUG=0
|
||||||
|
- APP_URL='http://ninja.dev'
|
||||||
|
-e APP_KEY=${APP_KEY}
|
||||||
|
-e APP_CIPHER='AES-256-CBC'
|
||||||
|
-e DB_TYPE='mysql'
|
||||||
|
-e DB_STRICT='false'
|
||||||
|
-e DB_HOST='localhost'
|
||||||
|
-e DB_DATABASE=${DB_DATABASE}
|
||||||
|
-e DB_USERNAME=${DB_USERNAME}
|
||||||
|
-e DB_PASSWORD=${DB_PASSWORD}
|
||||||
links:
|
links:
|
||||||
- db:mysql
|
- db:mysql
|
||||||
volumes_from:
|
volumes_from:
|
||||||
- invoiceninja
|
- invoiceninja
|
||||||
db:
|
db:
|
||||||
image: mysql
|
image: mysql
|
||||||
env_file: .env
|
environment:
|
||||||
|
- APP_ENV='production'
|
||||||
|
- APP_DEBUG=0
|
||||||
|
- APP_URL='http://ninja.dev'
|
||||||
|
-e APP_KEY=${APP_KEY}
|
||||||
|
-e APP_CIPHER='AES-256-CBC'
|
||||||
|
-e DB_TYPE='mysql'
|
||||||
|
-e DB_STRICT='false'
|
||||||
|
-e DB_HOST='localhost'
|
||||||
|
-e DB_DATABASE=${DB_DATABASE}
|
||||||
|
-e DB_USERNAME=${DB_USERNAME}
|
||||||
|
-e DB_PASSWORD=${DB_PASSWORD}
|
||||||
restart: always
|
restart: always
|
||||||
volumes:
|
volumes:
|
||||||
- ${VOLUME_DATA}:/var/lib/mysql:nocopy
|
- ${VOLUME_DATA}:/var/lib/mysql:nocopy
|
||||||
|
|||||||
@@ -4,27 +4,6 @@ catalog:
|
|||||||
version: "latest"
|
version: "latest"
|
||||||
description: Invoicing
|
description: Invoicing
|
||||||
questions:
|
questions:
|
||||||
- variable: "VOLUME_LOGO"
|
|
||||||
label: "Persistent Logo Volume"
|
|
||||||
description: |
|
|
||||||
The volume name that should be used for persistent storage
|
|
||||||
default: "InvoiceNinja-Logo"
|
|
||||||
required: false
|
|
||||||
type: string
|
|
||||||
- variable: "VOLUME_STORAGE"
|
|
||||||
label: "Persistent Storage Volume"
|
|
||||||
description: |
|
|
||||||
The volume name that should be used for persistent storage
|
|
||||||
default: "InvoiceNinja-Storage"
|
|
||||||
required: false
|
|
||||||
type: string
|
|
||||||
- variable: "VOLUME_DATA"
|
|
||||||
label: "Persistent Data Volume"
|
|
||||||
description: |
|
|
||||||
The volume name that should be used for persistent storage
|
|
||||||
default: "InvoiceNinja-Data"
|
|
||||||
required: false
|
|
||||||
type: string
|
|
||||||
- variable: "HOST_LABEL_KEY"
|
- variable: "HOST_LABEL_KEY"
|
||||||
label: "Host Label Key"
|
label: "Host Label Key"
|
||||||
description: |
|
description: |
|
||||||
@@ -39,5 +18,54 @@ catalog:
|
|||||||
default: "0000"
|
default: "0000"
|
||||||
required: true
|
required: true
|
||||||
type: string
|
type: string
|
||||||
|
- variable: "VOLUME_LOGO"
|
||||||
|
label: "Persistent Logo Volume"
|
||||||
|
description: |
|
||||||
|
The volume name that should be used for persistent storage
|
||||||
|
default: "InvoiceNinja-Logo"
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
- variable: "VOLUME_STORAGE"
|
||||||
|
label: "Persistent Storage Volume"
|
||||||
|
description: |
|
||||||
|
The volume name that should be used for persistent storage
|
||||||
|
default: "InvoiceNinja-Storage"
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
- variable: "VOLUME_DATA"
|
||||||
|
label: "Persistent Data 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: |
|
||||||
|
The volume name that should be used for persistent storage
|
||||||
|
default: "ninja"
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
- variable: "DB_USERNAME"
|
||||||
|
label: "Username for the database"
|
||||||
|
description: |
|
||||||
|
The volume name that should be used for persistent storage
|
||||||
|
default: "ninja"
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
- variable: "DB_PASSWORD"
|
||||||
|
label: "Password for the database user"
|
||||||
|
description: |
|
||||||
|
The volume name that should be used for persistent storage
|
||||||
|
default: "ninja"
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
- variable: "APP_KEY"
|
||||||
|
label: "Random string"
|
||||||
|
description: |
|
||||||
|
A random string
|
||||||
|
default: "SomeRandomStringSomeRandomString"
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
invoiceninja:
|
invoiceninja:
|
||||||
scale: 1
|
scale: 1
|
||||||
Reference in New Issue
Block a user