Skip to content

Commit

Permalink
Merge pull request netbox-community#188 from ChristianKniep/no_local_…
Browse files Browse the repository at this point in the history
…mounts

No local mounts
  • Loading branch information
jeremystretch authored Jul 5, 2016
2 parents 7a97858 + 3277eac commit d606266
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
5 changes: 5 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/"]
7 changes: 2 additions & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ services:
POSTGRES_PASSWORD: J5brHrAXFLQSif0K
POSTGRES_DB: netbox
netbox:
build: .
image: digitalocean/netbox
links:
- postgres
container_name: netbox
Expand All @@ -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:
Expand Down

0 comments on commit d606266

Please sign in to comment.