Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes logging config that prevented gunicon launch #1

Merged
merged 2 commits into from
Jun 19, 2017
Merged

Fixes logging config that prevented gunicon launch #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1072d24
Fixes logging config that prevented gunicon launch
cimnine Jun 19, 2017
552227c
Updates default Docker build branch to a stable version
cimnine Jun 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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