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

Don't put nginx config in the netbox-container

This commit is contained in:
Viktor Fogelberg 2017-12-01 12:42:30 +01:00
parent 03e8536db7
commit ba66175a77
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile
View File

@ -29,7 +29,6 @@ RUN pip install -r requirements.txt
COPY docker/configuration.docker.py /opt/netbox/netbox/netbox/configuration.py COPY docker/configuration.docker.py /opt/netbox/netbox/netbox/configuration.py
COPY docker/gunicorn_config.py /opt/netbox/ COPY docker/gunicorn_config.py /opt/netbox/
COPY docker/nginx.conf /etc/netbox-nginx/nginx.conf
WORKDIR /opt/netbox/netbox WORKDIR /opt/netbox/netbox

7
docker-compose.yml
View File

@ -10,18 +10,15 @@ services:
- postgres - postgres
env_file: netbox.env env_file: netbox.env
volumes: volumes:
- netbox-nginx-config:/etc/netbox-nginx/
- netbox-static-files:/opt/netbox/netbox/static - netbox-static-files:/opt/netbox/netbox/static
nginx: nginx:
image: nginx:1.11-alpine image: nginx:1.11-alpine
command: nginx -g 'daemon off;' -c /etc/netbox-nginx/nginx.conf command: nginx -g 'daemon off;' -c /etc/netbox-nginx/nginx.conf
depends_on:
- netbox
ports: ports:
- 80 - 80
volumes: volumes:
- netbox-static-files:/opt/netbox/netbox/static - netbox-static-files:/opt/netbox/netbox/static
- netbox-nginx-config:/etc/netbox-nginx/ - ./docker/nginx.conf:/etc/netbox-nginx/nginx.conf
postgres: postgres:
image: postgres:9.6-alpine image: postgres:9.6-alpine
env_file: postgres.env env_file: postgres.env
@ -29,5 +26,3 @@ services:
volumes: volumes:
netbox-static-files: netbox-static-files:
driver: local driver: local
netbox-nginx-config:
driver: local