Merge pull request #1 from ninech/fix_logging

Fixes logging config that prevented gunicon launch

Dockerfile

@@ -18,10 +18,10 @@ RUN apk add --no-cache \
 
 WORKDIR /opt
 
-ARG BRANCH=v2.0-beta3
+ARG BRANCH=v2.0.7
 ARG URL=https://github.com/digitalocean/netbox/archive/$BRANCH.tar.gz
 RUN wget -q -O - "${URL}" | tar xz \
-  && ln -s netbox* netbox
+  && mv netbox* netbox
 
 WORKDIR /opt/netbox
 RUN pip install -r requirements.txt

docker-compose.yml

@@ -5,7 +5,7 @@ services:
           context: .
           args:
             - BRANCH=${BRANCH-master}
-        image: digitalocean/netbox:${BRANCH-master}
+        image: ninech/netbox:${BRANCH-master}
         depends_on:
         - postgres
         env_file: netbox.env

docker/docker-entrypoint.sh

@@ -24,4 +24,4 @@ END
 /opt/netbox/netbox/manage.py collectstatic --no-input
 
 # start unicorn
-gunicorn --log-level debug --debug --error-logfile /dev/stderr --log-file /dev/stdout -c /opt/netbox/gunicorn_config.py netbox.wsgi
+gunicorn --log-level debug --debug -c /opt/netbox/gunicorn_config.py netbox.wsgi

docker/gunicorn_config.py

@@ -3,3 +3,6 @@ pythonpath = '/opt/netbox/netbox'
 bind = '0.0.0.0:8001'
 workers = 3
 user = 'root'
+errorlog = '-'
+accesslog = '-'
+capture_output = False