mirror of https://github.com/MISP/misp-docker
Merge pull request #153 from gvaishno/master
#150 Fix: Added default environment values as failover.
commit
3cce984b32
|
@ -14,28 +14,32 @@ services:
|
||||||
volumes:
|
volumes:
|
||||||
- ./web/wait-for-it.sh:/usr/local/bin/wait-for-it.sh:ro
|
- ./web/wait-for-it.sh:/usr/local/bin/wait-for-it.sh:ro
|
||||||
- /dev/urandom:/dev/random
|
- /dev/urandom:/dev/random
|
||||||
- ${DATA_DIR}/web:/var/www/MISP
|
- ${DATA_DIR:-./data}/web:/var/www/MISP
|
||||||
environment:
|
environment:
|
||||||
- MYSQL_HOST=${MYSQL_HOST}
|
- MYSQL_HOST=${MYSQL_HOST:-misp_db}
|
||||||
- MYSQL_DATABASE=${MYSQL_DATABASE}
|
- MYSQL_DATABASE=${MYSQL_DATABASE:-misp}
|
||||||
- MYSQL_USER=${MYSQL_USER}
|
- MYSQL_USER=${MYSQL_USER:-misp}
|
||||||
- MYSQL_PASSWORD=${MYSQL_PASSWORD}
|
- MYSQL_PASSWORD=${MYSQL_PASSWORD:-misp}
|
||||||
- MISP_ADMIN_EMAIL=${MISP_ADMIN_EMAIL}
|
- MISP_ADMIN_EMAIL=${MISP_ADMIN_EMAIL:-admin@admin.test}
|
||||||
- MISP_ADMIN_PASSPHRASE=${MISP_ADMIN_PASSPHRASE}
|
- MISP_ADMIN_PASSPHRASE=${MISP_ADMIN_PASSPHRASE:-admin}
|
||||||
- MISP_BASEURL=${MISP_BASEURL}
|
- MISP_BASEURL=${MISP_BASEURL:-https://localhost}
|
||||||
- POSTFIX_RELAY_HOST=${POSTFIX_RELAY_HOST}
|
- POSTFIX_RELAY_HOST=${POSTFIX_RELAY_HOST:-relay.fqdn}
|
||||||
- TIMEZONE=${TIMEZONE}
|
- TIMEZONE=${TIMEZONE:-UTC}
|
||||||
entrypoint: "wait-for-it.sh -t 0 -h ${MYSQL_HOST} -p 3306 -- /run.sh"
|
entrypoint: "wait-for-it.sh -t 0 -h ${MYSQL_HOST:-misp_db} -p 3306 -- /run.sh"
|
||||||
|
|
||||||
db:
|
db:
|
||||||
container_name: misp_db
|
container_name: misp_db
|
||||||
image: mysql/mysql-server:5.7
|
image: mysql/mysql-server:5.7
|
||||||
hostname: ${MYSQL_HOST}
|
hostname: ${MYSQL_HOST:-misp_db}
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
volumes:
|
||||||
- ${DATA_DIR}/db:/var/lib/mysql
|
- ${DATA_DIR:-./data}/db:/var/lib/mysql
|
||||||
environment:
|
environment:
|
||||||
- MYSQL_DATABASE=${MYSQL_DATABASE}
|
- MYSQL_DATABASE=${MYSQL_DATABASE:-misp}
|
||||||
- MYSQL_USER=${MYSQL_USER}
|
- MYSQL_USER=${MYSQL_USER:-misp}
|
||||||
- MYSQL_PASSWORD=${MYSQL_PASSWORD}
|
- MYSQL_PASSWORD=${MYSQL_PASSWORD:-misp}
|
||||||
- MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
|
- MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-misp}
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
web:
|
||||||
|
db:
|
||||||
|
|
Loading…
Reference in New Issue