From bec7469dc2c104ac9c120d8f599cb6ae107794ed Mon Sep 17 00:00:00 2001 From: Corey Shields Date: Sun, 3 Jan 2021 15:37:06 -0500 Subject: [PATCH] bump container from python 3.8.6 to 3.8.7, revert gunicorn There are a slew of issues related to eventlet monkeypatching ssl.py which leads to the issues we've seen in the updates I pushed to dev this week. The gunicorn update to 20 seems to be the culprit here, and wasn't caught locally because "develop" in djangoctl.sh uses the django runserver, not gunicorn. Hopefully this fixes our issues, and I'll slowly update eventlet, requests, and urllib3 back up Signed-off-by: Corey Shields --- Dockerfile | 2 +- requirements.txt | 4 ++-- setup.cfg | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9196fbb..73a8907 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.8.6 +FROM python:3.8.7 MAINTAINER SatNOGS project WORKDIR /workdir/ diff --git a/requirements.txt b/requirements.txt index b3f8928..03264bc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -35,10 +35,10 @@ djangorestframework==3.12.2 dnspython==1.16.0 ecdsa==0.14.1 enum34==1.1.10 -eventlet==0.30.0 +eventlet==0.29.1 frozendict==1.2 greenlet==0.4.17 -gunicorn==20.0.4 +gunicorn==19.9.0 h5py==3.1.0 idna==2.10 importlib-metadata==1.7.0 diff --git a/setup.cfg b/setup.cfg index 7f4fd7b..9530009 100644 --- a/setup.cfg +++ b/setup.cfg @@ -30,7 +30,7 @@ install_requires = celery~=4.3.0 # Deployment mysqlclient~=2.0.0 - gunicorn[eventlet]~=20.0.0 + gunicorn[eventlet]~=19.9.0 # Cache django-redis-cache~=3.0.0 # Logging @@ -79,6 +79,7 @@ install_requires = # pinning for auth0 bug urllib3==1.25.11 requests==2.24.0 + eventlet==0.29.1 [options.extras_require] dev =