Switching to .env File Instead

This commit is contained in:
WilliamMiceli
2018-06-24 19:06:09 -04:00
parent 162991af3a
commit 5f74ec5a83
2 changed files with 4 additions and 37 deletions

View File

@@ -2,16 +2,7 @@ version: '2'
services: services:
app: app:
image: invoiceninja/invoiceninja image: invoiceninja/invoiceninja
environment: env_file: .env
- APP_DEBUG=0
- APP_ENV='production'
- APP_KEY=${APP_KEY}
- APP_CIPHER='AES-256-CBC'
- APP_URL='http://localhost:${WEB_PORT}'
- DB_HOST='mysql'
- DB_DATABASE='ninja'
- DB_USERNAME='root'
- DB_PASSWORD='ninjaPass'
labels: labels:
io.rancher.scheduler.affinity:host_label: ${LABEL_KEY_VALUE} io.rancher.scheduler.affinity:host_label: ${LABEL_KEY_VALUE}
io.rancher.sidekicks: cron, web io.rancher.sidekicks: cron, web
@@ -21,6 +12,7 @@ services:
volumes: volumes:
- ${STORAGE_BASE_DIR}${LOGO_DIR}:/var/www/app/public/logo - ${STORAGE_BASE_DIR}${LOGO_DIR}:/var/www/app/public/logo
- ${STORAGE_BASE_DIR}${STORAGE_DIR}:/var/www/app/storage - ${STORAGE_BASE_DIR}${STORAGE_DIR}:/var/www/app/storage
- ${STORAGE_BASE_DIR}${CONFIG_DIR}/.env:/var/www/app/.env
cron: cron:
image: invoiceninja/invoiceninja image: invoiceninja/invoiceninja
entrypoint: | entrypoint: |
@@ -33,16 +25,7 @@ services:
sleep 1h sleep 1h
done done
EOF' EOF'
environment: env_file: .env
- APP_DEBUG=0
- APP_ENV='production'
- APP_KEY=${APP_KEY}
- APP_CIPHER='AES-256-CBC'
- APP_URL='http://localhost:${WEB_PORT}'
- DB_HOST='mysql'
- DB_DATABASE='ninja'
- DB_USERNAME='root'
- DB_PASSWORD='ninjaPass'
labels: labels:
io.rancher.scheduler.affinity:host_label: ${LABEL_KEY_VALUE} io.rancher.scheduler.affinity:host_label: ${LABEL_KEY_VALUE}
links: links:
@@ -52,9 +35,7 @@ services:
- app - app
db: db:
image: mysql image: mysql
environment: env_file: .env
- MYSQL_ROOT_PASSWORD='ninjaPass'
- MYSQL_DATABASE='ninja'
labels: labels:
io.rancher.scheduler.affinity:host_label: ${LABEL_KEY_VALUE} io.rancher.scheduler.affinity:host_label: ${LABEL_KEY_VALUE}
restart: on-failure restart: on-failure

View File

@@ -11,13 +11,6 @@ catalog:
default: "host.id=0000" default: "host.id=0000"
required: true required: true
type: string type: string
- variable: "WEB_PORT"
label: "Port Number"
description: |
The port to access the web interface on.
default: "8000"
required: true
type: string
- variable: "STORAGE_BASE_DIR" - variable: "STORAGE_BASE_DIR"
label: "Base Storage Directory" label: "Base Storage Directory"
description: | description: |
@@ -53,12 +46,5 @@ catalog:
default: "/Config" default: "/Config"
required: true required: true
type: string type: string
- variable: "APP_KEY"
label: "Random string"
description: |
A random string
default: "SomeRandomStringSomeRandomString"
required: true
type: string
app: app:
scale: 1 scale: 1