From 1a18cd17515d5ee28a2fbd49b986dad7a7fd6f0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kone=C4=8Dn=C3=BD?= Date: Tue, 25 Apr 2023 15:07:03 +0200 Subject: [PATCH] [release-monitoring] Update container to F38 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The F36 container is failing in staging when build is running. I updated the [dev env to F38](https://github.com/fedora-infra/anitya/pull/1567) to try if the issue will still be there and it didn't show up. Let's update the OpenShift deployment as well. Signed-off-by: Michal Konečný --- .../release-monitoring/templates/buildconfig.yml | 11 +++-------- .../release-monitoring/templates/httpd.conf | 8 ++++---- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/roles/openshift-apps/release-monitoring/templates/buildconfig.yml b/roles/openshift-apps/release-monitoring/templates/buildconfig.yml index 1b597761ea..972e3fd8fb 100644 --- a/roles/openshift-apps/release-monitoring/templates/buildconfig.yml +++ b/roles/openshift-apps/release-monitoring/templates/buildconfig.yml @@ -11,7 +11,7 @@ items: runPolicy: Serial source: dockerfile: |- - FROM fedora:36 + FROM fedora:38 LABEL \ name="release-monitoring-web" \ vendor="Fedora Infrastructure" \ @@ -29,7 +29,6 @@ items: python3-dateutil \ python3-defusedxml \ python3-flask-login \ - python3-flask-restful \ python3-flask-wtf \ python3-jinja2 \ python3-mod_wsgi \ @@ -46,10 +45,6 @@ items: python3-wtforms && \ dnf autoremove -y && \ dnf clean all -y - # Install newer version of flask-login than what is available in Fedora 36 - # It has issue with werkzeug package available in Fedora - # See https://github.com/maxcountryman/flask-login/pull/691 for more info - RUN pip install Flask-Login==0.6.2 RUN git clone https://github.com/fedora-infra/anitya.git && \ pushd anitya && \ {% if env == 'staging' %} @@ -78,12 +73,12 @@ items: rm -rf anitya {% if env == 'staging' %} # Let's use staging auth server in staging - RUN sed -i 's/id.fedoraproject.org/id.stg.fedoraproject.org/g' /usr/local/lib/python3.10/site-packages/social_core/backends/fedora.py + RUN sed -i 's/id.fedoraproject.org/id.stg.fedoraproject.org/g' /usr/local/lib/python3.11/site-packages/social_core/backends/fedora.py {% endif %} # Hotfix for social_auth-sqlalchemy # Could be removed when we switch to something else - RUN sed -i 's/base64.encodestring/base64.encodebytes/g' /usr/local/lib/python3.10/site-packages/social_sqlalchemy/storage.py + RUN sed -i 's/base64.encodestring/base64.encodebytes/g' /usr/local/lib/python3.11/site-packages/social_sqlalchemy/storage.py RUN mkdir /httpdir RUN chmod 777 /httpdir EXPOSE 8080 diff --git a/roles/openshift-apps/release-monitoring/templates/httpd.conf b/roles/openshift-apps/release-monitoring/templates/httpd.conf index 67aae00b9d..7bb8705f84 100644 --- a/roles/openshift-apps/release-monitoring/templates/httpd.conf +++ b/roles/openshift-apps/release-monitoring/templates/httpd.conf @@ -27,11 +27,11 @@ StartServers 20 ServerLimit 100 MaxRequestsPerChild 2000 MaxRequestWorkers 100 - + AllowOverride None Require all granted - + AllowOverride None Require all granted @@ -55,8 +55,8 @@ LogLevel info TypesConfig /etc/mime.types AddDefaultCharset UTF-8 CoreDumpDirectory /tmp -Alias /docs /usr/local/lib/python3.10/site-packages/anitya/static/docs/html/ -Alias /static /usr/local/lib/python3.10/site-packages/anitya/static/ +Alias /docs /usr/local/lib/python3.11/site-packages/anitya/static/docs/html/ +Alias /static /usr/local/lib/python3.11/site-packages/anitya/static/ WSGIDaemonProcess anitya display-name=anitya processes=2 threads=2 maximum-requests=1000 home=/httpdir WSGIApplicationGroup %{GLOBAL} WSGISocketPrefix run/wsgi