Skip to content

Commit

Permalink
Merge pull request #1 from ninech/fix_logging
Browse files Browse the repository at this point in the history
Fixes logging config that prevented gunicon launch
  • Loading branch information
cimnine authored Jun 19, 2017
2 parents fe82d10 + 552227c commit 98d9058
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions docker/gunicorn_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@
bind = '0.0.0.0:8001'
workers = 3
user = 'root'
errorlog = '-'
accesslog = '-'
capture_output = False

0 comments on commit 98d9058

Please sign in to comment.