Merge pull request #1 from ninech/fix_logging

Fixes logging config that prevented gunicon launch
This commit is contained in:
Christian Mäder 2017-06-19 09:33:14 +02:00 committed by GitHub
commit 98d90582b7
4 changed files with 7 additions and 4 deletions

View File

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

View File

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

View File

@ -24,4 +24,4 @@ END
/opt/netbox/netbox/manage.py collectstatic --no-input /opt/netbox/netbox/manage.py collectstatic --no-input
# start unicorn # 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

View File

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