From 540c1ae874bf5132d2d74c55878440dbe9ef2e90 Mon Sep 17 00:00:00 2001 From: Michal Konecny Date: Thu, 16 May 2024 15:32:10 +0200 Subject: [PATCH] [release-monitoring] Update staging deployment to F40 As tested locally F40 container deployment works, but let's test it on staging first. Signed-off-by: Michal Konecny --- .../release-monitoring/templates/buildconfig.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/roles/openshift-apps/release-monitoring/templates/buildconfig.yml b/roles/openshift-apps/release-monitoring/templates/buildconfig.yml index 2e2d12b404..94f4a9034e 100644 --- a/roles/openshift-apps/release-monitoring/templates/buildconfig.yml +++ b/roles/openshift-apps/release-monitoring/templates/buildconfig.yml @@ -11,7 +11,11 @@ items: runPolicy: Serial source: dockerfile: |- +{% if env == 'staging' %} + FROM fedora:40 +{% else %} FROM fedora:38 +{% endif %} LABEL \ name="release-monitoring-web" \ vendor="Fedora Infrastructure" \ @@ -75,12 +79,14 @@ 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.11/site-packages/social_core/backends/fedora.py + RUN sed -i 's/id.fedoraproject.org/id.stg.fedoraproject.org/g' /usr/local/lib/python3.12/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.11/site-packages/social_sqlalchemy/storage.py +{% if env == 'staging' %} + RUN sed -i 's/base64.encodestring/base64.encodebytes/g' /usr/local/lib/python3.12/site-packages/social_sqlalchemy/storage.py +{% endif %} RUN mkdir /httpdir RUN chmod 777 /httpdir EXPOSE 8080