From ab0c25504043bc7f9b8ae081dfac1e88dab6ae9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Ma=CC=88der?= <cma@nine.ch>
Date: Wed, 30 Aug 2017 11:09:24 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=B3=20Change=20to=20the=20actual=20wor?=
 =?UTF-8?q?kdir?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile                  | 4 +++-
 docker/docker-entrypoint.sh | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index cc80c33..b79efd4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,10 +27,12 @@ RUN wget -q -O - "${URL}" | tar xz \
 WORKDIR /opt/netbox
 RUN pip install -r requirements.txt
 
-RUN ln -s configuration.docker.py netbox/netbox/configuration.py
+RUN ln -s 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
+
 COPY docker/docker-entrypoint.sh /docker-entrypoint.sh
 ENTRYPOINT [ "/docker-entrypoint.sh" ]
 
diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index e65c648..d921de0 100755
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -2,7 +2,7 @@
 set -e
 
 # run db migrations (retry on error)
-while ! /opt/netbox/netbox/manage.py migrate 2>&1; do
+while ! ./manage.py migrate 2>&1; do
     sleep 5
 done
 
@@ -14,14 +14,14 @@ if [[ -z ${SUPERUSER_NAME} || -z ${SUPERUSER_EMAIL} || -z ${SUPERUSER_PASSWORD}
         echo "Using defaults: Username: ${SUPERUSER_NAME}, E-Mail: ${SUPERUSER_EMAIL}, Password: ${SUPERUSER_PASSWORD}"
 fi
 
-python netbox/manage.py shell --plain << END
+./manage.py shell --plain << END
 from django.contrib.auth.models import User
 if not User.objects.filter(username='${SUPERUSER_NAME}'):
     User.objects.create_superuser('${SUPERUSER_NAME}', '${SUPERUSER_EMAIL}', '${SUPERUSER_PASSWORD}')
 END
 
 # copy static files
-/opt/netbox/netbox/manage.py collectstatic --no-input
+./manage.py collectstatic --no-input
 
 # start unicorn
 gunicorn --log-level debug --debug -c /opt/netbox/gunicorn_config.py netbox.wsgi