diff --git a/Dockerfile b/Dockerfile index 8e3a1cd..1e9be0d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,6 @@ RUN pip install -r requirements.txt COPY docker/configuration.docker.py /opt/netbox/netbox/netbox/configuration.py COPY docker/gunicorn_config.py /opt/netbox/ -COPY docker/nginx.conf /etc/netbox-nginx/nginx.conf WORKDIR /opt/netbox/netbox diff --git a/docker-compose.yml b/docker-compose.yml index d34b591..dab2da2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,18 +10,15 @@ services: - postgres env_file: netbox.env volumes: - - netbox-nginx-config:/etc/netbox-nginx/ - netbox-static-files:/opt/netbox/netbox/static nginx: image: nginx:1.11-alpine command: nginx -g 'daemon off;' -c /etc/netbox-nginx/nginx.conf - depends_on: - - netbox ports: - 80 volumes: - netbox-static-files:/opt/netbox/netbox/static - - netbox-nginx-config:/etc/netbox-nginx/ + - ./docker/nginx.conf:/etc/netbox-nginx/nginx.conf postgres: image: postgres:9.6-alpine env_file: postgres.env @@ -29,5 +26,3 @@ services: volumes: netbox-static-files: driver: local - netbox-nginx-config: - driver: local