Merge branch 'develop' of github.com:digitalocean/netbox into develop

.gitignore

@@ -4,3 +4,4 @@ configuration.py
 /*.sh
 !upgrade.sh
 fabfile.py
+*.swp

Dockerfile

@@ -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/"]

docker-compose.yml

@@ -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: