Skip to content

Commit

Permalink
Merge branch 'testapi'
Browse files Browse the repository at this point in the history
  • Loading branch information
lzy7071 committed Jun 8, 2020
2 parents 61df485 + cc7c248 commit 4607195
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Dockerfile
Expand Up @@ -46,6 +46,6 @@ RUN apt-get purge -y --autoremove git ca-certificates \
&& rm -rf "$tempDir" /etc/apt/sources.list.d/temp.list; \
fi

CMD gunicorn --bind 127.0.0.1:8001 "datanator_rest_api.core:application" --daemon \
CMD gunicorn --bind 127.0.0.1:8001 --graceful-timeout 30 --timeout 60 "datanator_rest_api.core:application" --daemon \
&& sed -i -e 's/$PORT/'"$PORT"'/g' /etc/nginx/nginx.conf \
&& nginx -g 'daemon off;'
1 change: 1 addition & 0 deletions nginx/default.conf
Expand Up @@ -36,6 +36,7 @@ http {
proxy_redirect off;
proxy_read_timeout 300s;
proxy_connect_timeout 75s;
proxy_buffering off;
proxy_set_header Host $http_host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
Expand Down

0 comments on commit 4607195

Please sign in to comment.