From 27948a7cc67232ff219bfe720671c70f18fe6b6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kone=C4=8Dn=C3=BD?= Date: Mon, 6 Jun 2022 15:25:53 +0200 Subject: [PATCH] [release-monitoring] Update to f36 on staging MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This also introduces the hotfix for the social_auth issue. So it should be possible to login on staging. Signed-off-by: Michal Konečný --- .../release-monitoring/templates/buildconfig.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/roles/openshift-apps/release-monitoring/templates/buildconfig.yml b/roles/openshift-apps/release-monitoring/templates/buildconfig.yml index c8237c00bc..1db3016b80 100644 --- a/roles/openshift-apps/release-monitoring/templates/buildconfig.yml +++ b/roles/openshift-apps/release-monitoring/templates/buildconfig.yml @@ -11,7 +11,7 @@ items: source: dockerfile: |- {% if env == 'staging' %} - FROM fedora:34 + FROM fedora:36 {% else %} FROM fedora:32 {% endif %} @@ -82,7 +82,11 @@ items: rm -rf anitya # Let's use staging auth server in staging {% if env == 'staging' %} - RUN sed -i 's/id.fedoraproject.org/id.stg.fedoraproject.org/g' /usr/local/lib/python3.9/site-packages/social_auth_core-4.1.0-py3.9.egg/social_core/backends/fedora.py + RUN sed -i 's/id.fedoraproject.org/id.stg.fedoraproject.org/g' /usr/local/lib/python3.10/site-packages/social_core/backends/fedora.py + + # 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 {% endif %} RUN mkdir /httpdir RUN chmod 777 /httpdir