From ecb5ecd1a4c6cbcbb22bfab5154d052e9187d568 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Ma=CC=88der?= Date: Fri, 21 Apr 2017 13:46:15 +0200 Subject: [PATCH] Restructured docker-compose.yml --- docker-compose.yml | 55 ++++++++++++++-------------------------------- netbox.env | 17 ++++++++++++++ 2 files changed, 34 insertions(+), 38 deletions(-) create mode 100644 netbox.env diff --git a/docker-compose.yml b/docker-compose.yml index d435066..dcc95b1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,53 +1,32 @@ -version: '2' - +version: '3' services: - postgres: - image: postgres:9.6 - container_name: postgres - environment: - POSTGRES_USER: netbox - POSTGRES_PASSWORD: J5brHrAXFLQSif0K - POSTGRES_DB: netbox netbox: build: . - image: digitalocean/netbox - links: - - postgres - container_name: netbox + image: digitalocean/netbox:v2.0-beta2 depends_on: - postgres - environment: - SUPERUSER_NAME: admin - SUPERUSER_EMAIL: admin@example.com - SUPERUSER_PASSWORD: admin - ALLOWED_HOSTS: localhost - DB_NAME: netbox - DB_USER: netbox - DB_PASSWORD: J5brHrAXFLQSif0K - DB_HOST: postgres - SECRET_KEY: r8OwDznj!!dci#P9ghmRfdu1Ysxm0AiPeDCQhKE+N_rClfWNj - EMAIL_SERVER: localhost - EMAIL_PORT: 25 - EMAIL_USERNAME: foo - EMAIL_PASSWORD: bar - EMAIL_TIMEOUT: 10 - EMAIL_FROM: netbox@bar.com - NETBOX_USERNAME: guest - NETBOX_PASSWORD: guest + env_file: netbox.env volumes: + - netbox-nginx-config:/etc/netbox-nginx/ - netbox-static-files:/opt/netbox/netbox/static nginx: - image: nginx:1.11.1-alpine - links: - - netbox - container_name: nginx + image: nginx:1.11-alpine command: nginx -g 'daemon off;' -c /etc/netbox-nginx/nginx.conf depends_on: - netbox ports: - - 80:80 - volumes_from: - - netbox + - 80 + volumes: + - netbox-static-files:/opt/netbox/netbox/static + - netbox-nginx-config:/etc/netbox-nginx/ + postgres: + image: postgres:9.6-alpine + environment: + POSTGRES_USER: netbox + POSTGRES_PASSWORD: J5brHrAXFLQSif0K + POSTGRES_DB: netbox volumes: netbox-static-files: driver: local + netbox-nginx-config: + driver: local diff --git a/netbox.env b/netbox.env new file mode 100644 index 0000000..4bc812f --- /dev/null +++ b/netbox.env @@ -0,0 +1,17 @@ +SUPERUSER_NAME=admin +SUPERUSER_EMAIL=admin@example.com +SUPERUSER_PASSWORD=admin +ALLOWED_HOSTS=localhost +DB_NAME=netbox +DB_USER=netbox +DB_PASSWORD=J5brHrAXFLQSif0K +DB_HOST=postgres +SECRET_KEY=r8OwDznj!!dci#P9ghmRfdu1Ysxm0AiPeDCQhKE+N_rClfWNj +EMAIL_SERVER=localhost +EMAIL_PORT=25 +EMAIL_USERNAME=foo +EMAIL_PASSWORD=bar +EMAIL_TIMEOUT=10 +EMAIL_FROM=netbox@bar.com +NETBOX_USERNAME=guest +NETBOX_PASSWORD=guest