Update to base-flask v3.19.3

Author: albertyw

.drone.yml

@@ -9,14 +9,16 @@ volumes:
 
 steps:
   - name: Test Python
-    image: python:3.11
+    image: python:3.11-slim-bullseye
     commands:
+      - apt-get update && apt-get install -y curl git
       - ln -fs .env.development .env
       - pip install -r requirements.txt
       - pip install -r requirements-test.txt
       - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > "${HOME}/bin/cc-test-reporter"
       - chmod +x "${HOME}/bin/cc-test-reporter"
       - flake8
+      - gunicorn -c config/gunicorn.conf.py --check-config
       - mypy . --ignore-missing-imports --strict
       - cc-test-reporter before-build
       - coverage run -m unittest discover

Dockerfile

@@ -1,12 +1,11 @@
-FROM node:18 as node
+FROM node:18-slim as node
 WORKDIR /
 COPY . .
 RUN npm ci --only=production \
     && npm run minify
 
 
-# Need buster for uwsgi builds
-FROM python:3.11-buster
+FROM python:3.11-slim-bullseye
 
 LABEL maintainer="git@albertyw.com"
 EXPOSE 5000

bin/start.sh

@@ -10,5 +10,5 @@ IFS=$'\n\t'
 rm -rf static/mount/*
 cp -r static/* static/mount || true
 
-# Run supervisor to run uwsgi
+# Run supervisor to run gunicorn
 supervisord -c config/supervisord.conf

config/gunicorn.conf.py

@@ -0,0 +1,20 @@
+import multiprocessing
+
+
+proc_name = 'chase-center-calendar'
+wsgi_app = 'app.serve:app'
+
+bind = '0.0.0.0:5000'
+forwarded_allow_ips = '*'
+workers = multiprocessing.cpu_count() * 2 + 1
+preload_app = True
+
+accesslog = '/var/www/app/logs/gunicorn/access.log'
+errorlog = '/var/www/app/logs/gunicorn/error.log'
+access_log_format = (
+    '%({x-forwarded-for}i)s %(l)s %(u)s %(t)s "%(r)s" %(s)s %(b)s "%(f)s" '
+    '"%(a)s"'
+)
+
+max_requests = 5000
+max_requests_jitter = 1000

config/supervisord.conf

@@ -4,11 +4,11 @@ logfile=/var/www/app/logs/supervisord/supervisord.log
 pidfile=/var/run/supervisord.pid
 user=root
 
-[program:uwsgi]
-command=/usr/local/bin/uwsgi --ini /var/www/app/config/uwsgi/website.ini
+[program:gunicorn]
+command=gunicorn -c /var/www/app/config/gunicorn.conf.py
 directory=/var/www/app
-stdout_logfile=/var/www/app/logs/supervisord/uwsgi-stdout.log
-stderr_logfile=/var/www/app/logs/supervisord/uwsgi-stderr.log
+stdout_logfile=/var/www/app/logs/supervisord/gunicorn-stdout.log
+stderr_logfile=/var/www/app/logs/supervisord/gunicorn-stderr.log
 stdout_logfile_maxbytes=10000000
 stderr_logfile_maxbytes=10000000
 autostart=true

config/uwsgi/website.ini

@@ -0,0 +1 @@
+*log*

config/uwsgi/websiterunner.py

@@ -1,7 +1,7 @@
 # Core packages
 python-dotenv==0.21.0  # Read environment variables from .env
 Flask==2.2.2           # Web microframework
-uWSGI==2.0.21          # Application server
+gunicorn==20.1.0       # WSGI server
 syspath==3.0.1         # Modify paths
 
 # Features
@@ -14,4 +14,5 @@ python-slugify==7.0.0  # Generate string slugs
 # Monitoring/tracking/logging
 blinker==1.5           # Dependency of rollbar
 rollbar==0.16.3        # rollbar.com error logging
-varsnap==1.5.4         # Test discovery
+setproctitle==1.3.2    # Allow gunicorn to set process title
+varsnap==1.5.5         # Test discovery