Merge remote-tracking branch 'chrigl/fix-add-nginx-conf'

This commit is contained in:
Christian Mäder 2017-05-10 16:55:35 +02:00
commit 128c63de2b
No account linked to committer's email address

View File

@ -28,6 +28,7 @@ RUN pip install -r requirements.txt
RUN ln -s configuration.docker.py netbox/netbox/configuration.py RUN ln -s configuration.docker.py 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
COPY docker/docker-entrypoint.sh /docker-entrypoint.sh COPY docker/docker-entrypoint.sh /docker-entrypoint.sh
ENTRYPOINT [ "/docker-entrypoint.sh" ] ENTRYPOINT [ "/docker-entrypoint.sh" ]