Merge pull request #2968 from matyasselmeci/pr/werkzeug

Use Python 3.9 and a newer version of Werkzeug

Dockerfile

@@ -1,4 +1,4 @@
-FROM opensciencegrid/software-base:3.6-el8-release
+FROM opensciencegrid/software-base:3.6-al8-release
 
 # Install dependencies (application, Apache)
 RUN \
@@ -7,8 +7,8 @@ RUN \
       gcc \
       git \
       libyaml-devel \
-      python3-devel \
-      python3-pip \
+      python39-devel \
+      python39-pip \
     && yum install -y \
       fetch-crl \
       httpd \
@@ -19,6 +19,8 @@ RUN \
       /usr/bin/pkill \
     && yum clean all && rm -rf /var/cache/yum/*
 
+RUN alternatives --set python3 /usr/bin/python3.9
+
 WORKDIR /app
 
 # Install application dependencies

docker/apache.conf

@@ -1,7 +1,7 @@
 Listen 8080
 Listen 8443
 
-LoadModule wsgi_module /usr/local/lib64/python3.6/site-packages/mod_wsgi/server/mod_wsgi-py36.cpython-36m-x86_64-linux-gnu.so
+LoadModule wsgi_module /usr/local/lib64/python3.9/site-packages/mod_wsgi/server/mod_wsgi-py39.cpython-39-x86_64-linux-gnu.so
 WSGIPythonPath /app
 
 # Run apps in separate processes to stop yaml.CSafeLoader import-time error

requirements-apache.txt

@@ -4,26 +4,25 @@
 asn1>=2.2.0,<2.3.0
 certifi>=2019.3.9
 chardet>=3.0.4,<3.1
-click==6.7
+click>=8,<9
 configobj>=5.0.6,<5.1
-Flask>=1.0.2,<1.1
-Flask-WTF>=0.14.2,<0.15
+Flask>=2.2.0,<2.3
+Flask-WTF>=1.0.1,<1.1
 GitPython>=3.1.9
 gunicorn>=19.9.0,<19.10
 icalendar>=4.0.0,<4.1.0
 idna==2.7
-itsdangerous==0.24
-Jinja2>=2.11.3,<2.12
+itsdangerous>=2.0,<2.1
+Jinja2>=3.1.2,<3.2
 ldap3>=2.6.1
-MarkupSafe<2.1
-# ^^ MarkupSafe stuck on 2.0.x due to removal of "soft_unicode" symbol
+MarkupSafe<2.2,>=2.1.1
 python-dateutil>=2.7.3,<2.8
 python-gnupg
 PyYAML>=5.4.1,<5.5
 requests>=2.25.0,<2.26
 six>=1.12.0,<1.13
 urllib3>=1.26.5,<1.27
-Werkzeug>=0.15.3,<0.16
+Werkzeug>=2.2.3,<2.3
 WTForms>=2.2.1,<2.3
 xmltodict>=0.11.0,<0.12
 # mod-wsgi requires apache httpd headers (redhat package httpd-devel, ubuntu package apache2-dev)

requirements-rootless.txt

@@ -4,25 +4,24 @@
 asn1>=2.2.0,<2.3.0
 certifi>=2019.3.9
 chardet>=3.0.4,<3.1
-click==6.7
+click>=8,<9
 configobj>=5.0.6,<5.1
-Flask>=1.0.2,<1.1
-Flask-WTF>=0.14.2,<0.15
+Flask>=2.2.0,<2.3
+Flask-WTF>=1.0.1,<1.1
 GitPython>=3.1.9
 gunicorn>=19.9.0,<19.10
 icalendar>=4.0.0,<4.1.0
 idna==2.7
-itsdangerous==0.24
-Jinja2>=2.11.3,<2.12
+itsdangerous>=2.0,<2.1
+Jinja2>=3.1.2,<3.2
 ldap3>=2.6.1
-MarkupSafe<2.1
-# ^^ MarkupSafe stuck on 2.0.x due to removal of "soft_unicode" symbol
+MarkupSafe<2.2,>=2.1.1
 python-dateutil>=2.7.3,<2.8
 python-gnupg
 PyYAML>=5.4.1,<5.5
 requests>=2.25.0,<2.26
 six>=1.12.0,<1.13
 urllib3>=1.26.5,<1.27
-Werkzeug>=0.15.3,<0.16
+Werkzeug>=2.2.3,<2.3
 WTForms>=2.2.1,<2.3
 xmltodict>=0.11.0,<0.12