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

Upgrade python, consul-template, uWSGI #451

Merged
merged 1 commit into from
Nov 28, 2023
Merged

Upgrade python, consul-template, uWSGI #451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
@@ -1,4 +1,4 @@
ARG PYTHON_BASE_IMAGE_VERSION=3.11-20221221
ARG PYTHON_BASE_IMAGE_VERSION=3.11-20231006
ARG NODE_VERSION=18-alpine
FROM metabrainz/python:$PYTHON_BASE_IMAGE_VERSION as metabrainz-base

Expand Down Expand Up @@ -83,7 +83,7 @@ RUN npm run build:prod
###########################################
FROM metabrainz-base as metabrainz-prod

RUN pip install --no-cache-dir uWSGI==2.0.22
RUN pip install --no-cache-dir uWSGI==2.0.23

COPY ./docker/prod/consul-template-uwsgi.conf /etc/

Expand Down
4 changes: 2 additions & 2 deletions docker/prod/consul-template-uwsgi.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ template {
}

exec {
command = "uwsgi /etc/uwsgi/uwsgi.ini"
splay = "30s"
command = ["uwsgi", "/etc/uwsgi/uwsgi.ini"]
splay = "5s"
reload_signal = "SIGHUP"
kill_signal = "SIGTERM"
kill_timeout = "30s"
Expand Down
5 changes: 3 additions & 2 deletions docker/prod/uwsgi.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
[uwsgi]
uid = www-data
gid = www-data
master = true
socket = 0.0.0.0:13031
module = metabrainz
Expand All @@ -11,5 +13,4 @@ log-x-forwarded-for=true
disable-logging = true
; quit uwsgi if the python app fails to load
need-app = true
; when uwsgi gets a sighup, quit completely and let runit restart us
exit-on-reload = true
die-on-term = true
Loading