[Python] Flask: fix build and unblock (#8113)

frameworks/Python/flask/benchmark_config.json

@@ -23,7 +23,7 @@
       "display_name": "Flask",
       "notes": "",
       "versus": "wsgi",
-      "tags": ["broken"]
+      "tags": [ ]
     },
     "raw": {
       "json_url": "/json",
@@ -47,7 +47,7 @@
       "display_name": "Flask-raw",
       "notes": "",
       "versus": "wsgi",
-      "tags": ["broken"]
+      "tags": [ ]
     },
     "socketify-wsgi": {
       "json_url": "/json",
@@ -109,7 +109,7 @@
       "display_name": "Flask",
       "notes": "PyPy",
       "versus": "wsgi",
-      "tags": ["broken"]
+      "tags": [ ]
     },
     "pypy-raw": {
       "json_url": "/json",
@@ -133,7 +133,7 @@
       "display_name": "Flask-raw",
       "notes": "PyPy",
       "versus": "wsgi",
-      "tags": ["broken"]
+      "tags": [ ]
     },
     "nginx-uwsgi": {
       "json_url": "/json",
@@ -157,7 +157,7 @@
       "display_name": "Flask",
       "notes": "",
       "versus": "wsgi",
-      "tags": ["broken"]
+      "tags": [ ]
     },
     "fastwsgi": {
       "json_url": "/json",

frameworks/Python/flask/flask-fastwsgi.dockerfile

@@ -4,13 +4,9 @@ FROM python:3.11-bullseye
 RUN apt-get update
 RUN apt-get install libpq-dev python3-dev -y
 
-ADD ./requirements-fastwsgi.txt /flask/
-
 WORKDIR /flask
-
-RUN pip3 install -r /flask/requirements-fastwsgi.txt
-
-ADD ./ /flask
+COPY ./ /flask
+RUN pip3 install -U pip; pip3 install -r /flask/requirements-fastwsgi.txt 
 
 EXPOSE 8080
 

frameworks/Python/flask/flask-nginx-uwsgi.dockerfile

@@ -1,15 +1,15 @@
-FROM python:3.8-buster
+FROM python:3.9-bullseye
 
 RUN curl -s http://nginx.org/keys/nginx_signing.key | apt-key add -
-RUN echo "deb http://nginx.org/packages/debian/ buster nginx" >> /etc/apt/sources.list
-RUN echo "deb-src http://nginx.org/packages/debian/ buster nginx" >> /etc/apt/sources.list
+RUN echo "deb http://nginx.org/packages/debian/ bullseye nginx" >> /etc/apt/sources.list
+RUN echo "deb-src http://nginx.org/packages/debian/ bullseye nginx" >> /etc/apt/sources.list
 
 RUN apt-get update -yqq && apt-get install -yqq nginx
 RUN apt-get install libpq-dev python3-dev -y
-ADD ./requirements.txt /flask/requirements.txt
-RUN pip3 install -r /flask/requirements.txt
-ADD ./ /flask
+
 WORKDIR /flask
+COPY ./ /flask
+RUN pip3 install -U pip; pip3 install -r /flask/requirements-uwsgi.txt 
 
 RUN sed -i 's|include .*/conf/uwsgi_params;|include /etc/nginx/uwsgi_params;|g' /flask/nginx.conf
 

frameworks/Python/flask/flask-pypy-raw.dockerfile

@@ -1,11 +1,11 @@
-FROM pypy:3.7-buster
+FROM pypy:3.9-bullseye
 
 RUN apt-get update
 RUN apt-get install libpq-dev python3-dev -y
-ADD ./requirements-pypy.txt /flask/requirements-pypy.txt
-RUN pip3 install -r /flask/requirements-pypy.txt
-ADD ./ /flask
+
 WORKDIR /flask
+COPY ./ /flask
+RUN pip3 install -U pip; pip3 install -r /flask/requirements-gunicorn.txt
 
 EXPOSE 8080
 

frameworks/Python/flask/flask-pypy.dockerfile

@@ -1,11 +1,11 @@
-FROM pypy:3
+FROM pypy:3.9-bullseye
 
 RUN apt-get update
 RUN apt-get install libpq-dev python3-dev -y
-ADD ./requirements-pypy.txt /flask/requirements-pypy.txt
-RUN pip3 install -r /flask/requirements-pypy.txt
-ADD ./ /flask
+
 WORKDIR /flask
+COPY ./ /flask
+RUN pip3 install -U pip; pip3 install -r /flask/requirements-gunicorn.txt
 
 EXPOSE 8080
 

frameworks/Python/flask/flask-raw.dockerfile

@@ -1,12 +1,12 @@
-FROM python:3.8-buster
+FROM python:3.9-bullseye
 
 
 RUN apt-get update
 RUN apt-get install libpq-dev python3-dev -y
-ADD ./requirements.txt /flask/requirements.txt
-RUN pip3 install -r /flask/requirements.txt
-ADD ./ /flask
+
 WORKDIR /flask
+COPY ./ /flask
+RUN pip3 install -U pip; pip3 install -r /flask/requirements-gunicorn.txt 
 
 EXPOSE 8080
 

frameworks/Python/flask/flask-socketify-wsgi-pypy.dockerfile

@@ -2,10 +2,10 @@ FROM pypy:3.9-bullseye
 
 RUN apt-get update
 RUN apt-get install libpq-dev python3-dev libuv1 -y
-ADD ./requirements-socketify.txt /flask/requirements.txt
-RUN pip3 install -r /flask/requirements.txt
-ADD ./ /flask
+
 WORKDIR /flask
+COPY ./ /flask
+RUN pip3 install -U pip; pip3 install -r /flask/requirements-socketify.txt
 
 EXPOSE 8080
 

frameworks/Python/flask/flask-socketify-wsgi.dockerfile

@@ -1,12 +1,12 @@
-FROM python:3.10-bullseye
+FROM python:3.11-bullseye
 
 
 RUN apt-get update
 RUN apt-get install libpq-dev python3-dev libuv1 -y
-ADD ./requirements-socketify.txt /flask/requirements.txt
-RUN pip3 install -r /flask/requirements.txt
-ADD ./ /flask
+
 WORKDIR /flask
+COPY ./ /flask
+RUN pip3 install -U pip; pip3 install -r /flask/requirements-socketify.txt
 
 EXPOSE 8080
 

frameworks/Python/flask/flask.dockerfile

@@ -1,12 +1,12 @@
-FROM python:3.8-buster
+FROM python:3.9-bullseye
 
 
 RUN apt-get update
 RUN apt-get install libpq-dev python3-dev -y
-ADD ./requirements.txt /flask/requirements.txt
-RUN pip3 install -r /flask/requirements.txt
-ADD ./ /flask
+
 WORKDIR /flask
+COPY ./ /flask
+RUN pip3 install -U pip; pip3 install -r /flask/requirements-gunicorn.txt 
 
 EXPOSE 8080
 

frameworks/Python/flask/requirements-fastwsgi.txt

@@ -1,3 +1,2 @@
-Flask==2.2.2
-click==8.0.1
+-r requirements.txt
 fastwsgi==0.0.9

frameworks/Python/flask/requirements-gunicorn.txt

@@ -0,0 +1,4 @@
+-r requirements.txt
+greenlet<0.5
+gunicorn==20.1.0
+meinheld==1.0.2

frameworks/Python/flask/requirements-pypy.txt

@@ -1,14 +0,0 @@
-click==8.0.1
-pony==0.7.14
-psycopg2cffi>=2.7
-Flask==2.0.1
-tornado==6.1
-greenlet<0.5
-gunicorn==20.1.0
-itsdangerous==2.0.1
-Jinja2==3.0.1
-MarkupSafe==2.0.1
-meinheld==1.0.2
-uWSGI==2.0.19.1
-Werkzeug==2.2.3
-ujson==5.4.0

frameworks/Python/flask/requirements-socketify.txt

@@ -1,3 +1,2 @@
-Flask==2.2.2
+-r requirements.txt
 git+https://github.com/cirospaciari/socketify.py.git@main#socketify
-

frameworks/Python/flask/requirements-uwsgi.txt

@@ -0,0 +1,2 @@
+-r requirements.txt
+uWSGI==2.0.21

frameworks/Python/flask/requirements.txt

@@ -1,16 +1,12 @@
+Flask==2.2.3
 click==8.0.1
-pony==0.7.14
-psycopg2==2.9.1
-psycopg2-binary==2.9.1
-psycopg2-pool==1.1
-Flask==2.0.1
-greenlet<0.5
-gunicorn==20.1.0
-itsdangerous==2.0.1
-Jinja2==3.0.1
-MarkupSafe==2.0.1
-meinheld==1.0.2
-uWSGI==2.0.19.1
-Werkzeug==2.2.3
+pony==0.7.16
+psycopg2==2.9.3; implementation_name=='cpython'
+psycopg2-binary==2.9.3; implementation_name=='cpython'
+psycopg2-pool==1.1; implementation_name=='cpython'
+psycopg2cffi==2.9.0; implementation_name=='pypy'
+itsdangerous==2.1.2
+Jinja2==3.0.3
+MarkupSafe==2.1.2
 ujson==5.4.0
-orjson==3.6.0
+orjson==3.8.7; implementation_name=='cpython'