matthew/netbox-docker
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'bdlamprecht-moving_env_files'

Browse Source
This commit is contained in:
Christian Mäder 2018-09-14 08:49:27 +02:00
commit 61414b7be7
No known key found for this signature in database
GPG Key ID: 92FFD0A711F196BB
4 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker-compose.yml
View File

@ -10,7 +10,7 @@ services:
- postgres - postgres
- redis - redis
- netbox-worker - netbox-worker
env_file: netbox.env env_file: env/netbox.env
volumes: volumes:
- ./startup_scripts:/opt/netbox/startup_scripts:ro - ./startup_scripts:/opt/netbox/startup_scripts:ro
- ./initializers:/opt/netbox/initializers:ro - ./initializers:/opt/netbox/initializers:ro
@ -40,7 +40,7 @@ services:
- netbox-nginx-config:/etc/netbox-nginx/:ro - netbox-nginx-config:/etc/netbox-nginx/:ro
postgres: postgres:
image: postgres:10.4-alpine image: postgres:10.4-alpine
env_file: postgres.env env_file: env/postgres.env
volumes: volumes:
- netbox-postgres-data:/var/lib/postgresql/data - netbox-postgres-data:/var/lib/postgresql/data
redis: redis:
@ -49,7 +49,7 @@ services:
- sh - sh
- -c # this is to evaluate the $REDIS_PASSWORD from the env - -c # this is to evaluate the $REDIS_PASSWORD from the env
- redis-server --appendonly yes --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose - redis-server --appendonly yes --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose
env_file: redis.env env_file: env/redis.env
volumes: volumes:
- netbox-redis-data:/data - netbox-redis-data:/data
volumes: volumes:

0
netbox.env → env/netbox.env vendored
View File

0
postgres.env → env/postgres.env vendored
View File

0
redis.env → env/redis.env vendored
View File