Merge pull request #188 from ChristianKniep/no_local_mounts

No local mounts
This commit is contained in:
Jeremy Stretch 2016-07-05 16:49:12 -04:00 committed by GitHub
commit 75789fc956
2 changed files with 7 additions and 5 deletions

View File

@ -21,5 +21,10 @@ RUN apt-get update && apt-get install -y \
&& apt-get purge -y --auto-remove git build-essential
ADD docker/docker-entrypoint.sh /docker-entrypoint.sh
ADD netbox/netbox/configuration.docker.py /opt/netbox/netbox/netbox/configuration.py
ENTRYPOINT [ "/docker-entrypoint.sh" ]
ADD docker/gunicorn_config.py /opt/netbox/
ADD docker/nginx.conf /etc/netbox-nginx/
VOLUME ["/etc/netbox-nginx/"]

View File

@ -9,7 +9,7 @@ services:
POSTGRES_PASSWORD: J5brHrAXFLQSif0K
POSTGRES_DB: netbox
netbox:
build: .
image: digitalocean/netbox
links:
- postgres
container_name: netbox
@ -34,20 +34,17 @@ services:
NETBOX_USERNAME: guest
NETBOX_PASSWORD: guest
volumes:
- $PWD/netbox/netbox/configuration.docker.py:/opt/netbox/netbox/netbox/configuration.py:ro
- $PWD/docker/gunicorn_config.py:/opt/netbox/gunicorn_config.py:ro
- netbox-static-files:/opt/netbox/netbox/static
nginx:
image: nginx:1.11.1-alpine
links:
- netbox
container_name: nginx
command: nginx -g 'daemon off;' -c /etc/netbox-nginx/nginx.conf
depends_on:
- netbox
ports:
- 80:80
volumes:
- $PWD/docker/nginx.conf:/etc/nginx/nginx.conf:ro
volumes_from:
- netbox
volumes: