From 60cc88bcde521ac67d6aa74a77395e5bf72c3d14 Mon Sep 17 00:00:00 2001
From: Christian Koep <christiankoep@gmail.com>
Date: Sat, 2 Jul 2016 17:30:12 +0200
Subject: [PATCH 1/4] Add vi swap files to gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index e769694ea..954607b60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ configuration.py
 /*.sh
 !upgrade.sh
 fabfile.py
+*.swp

From 6e1f8d350303327f98a40af43d94a2b08478ae21 Mon Sep 17 00:00:00 2001
From: Christian Kniep <ckniep@gaikai.com>
Date: Mon, 4 Jul 2016 10:42:01 +0200
Subject: [PATCH 2/4] put config into netbox image

---
 Dockerfile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index ad73acce3..c2e2c38ab 100644
--- a/Dockerfile
+++ b/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/"]

From 85c55cd27fa3a229f7942589f6cd744d7d167bd4 Mon Sep 17 00:00:00 2001
From: Christian Kniep <ckniep@gaikai.com>
Date: Mon, 4 Jul 2016 10:42:24 +0200
Subject: [PATCH 3/4] use volumes of netbox, holding default config

---
 docker-compose.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index e280b95ff..44a65f4f8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,12 +9,14 @@ services:
             POSTGRES_PASSWORD: J5brHrAXFLQSif0K
             POSTGRES_DB: netbox
     netbox:
-        build: .
+        image: digitalocean/netbox
         links:
         - postgres
         container_name: netbox
         depends_on:
         - postgres
+        ports:
+         - 8001:8001
         environment:
             SUPERUSER_NAME: admin
             SUPERUSER_EMAIL: admin@example.com
@@ -34,20 +36,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:

From af873456377e1d1134eb71bf685fda93e01b8921 Mon Sep 17 00:00:00 2001
From: Christian Kniep <ckniep@gaikai.com>
Date: Mon, 4 Jul 2016 10:51:52 +0200
Subject: [PATCH 4/4] remove debug port exposure for netbox

---
 docker-compose.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 44a65f4f8..860022707 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,8 +15,6 @@ services:
         container_name: netbox
         depends_on:
         - postgres
-        ports:
-         - 8001:8001
         environment:
             SUPERUSER_NAME: admin
             SUPERUSER_EMAIL: admin@example.com