From 41764dcee3353376b072638b4b57aa6c0f9ea870 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 1 Apr 2024 09:39:26 -0700 Subject: [PATCH] bodhi / staging: drop db patch for now because fedora 39 does not use the same python Signed-off-by: Kevin Fenzi --- roles/openshift-apps/bodhi/templates/dockerfile-base | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/openshift-apps/bodhi/templates/dockerfile-base b/roles/openshift-apps/bodhi/templates/dockerfile-base index 67e5950ff4..3da18ebf5a 100644 --- a/roles/openshift-apps/bodhi/templates/dockerfile-base +++ b/roles/openshift-apps/bodhi/templates/dockerfile-base @@ -19,9 +19,11 @@ RUN dnf install -y bodhi-server python3-pyramid_sawing python3-gunicorn sed --re RUN dnf install -y bodhi-server-{{bodhi_version}} python3-pyramid_sawing python3-gunicorn sed {% endif %} +{% if env != "staging" %} # Temporary patch for testing fix for pod crashes RUN curl https://github.com/fedora-infra/bodhi/commit/0c302e26003756544f63bbeba016f75f3f037a03.patch -o /tmp/dbTimeout.patch RUN patch -p3 -ruN -d /usr/lib/python3.11/site-packages/bodhi < /tmp/dbTimeout.patch +{% endif %} # link the static files for a simpler httpd.conf RUN ln -s $(python3 -Ic "import sysconfig; print(sysconfig.get_path('purelib', 'rpm_prefix'))")/bodhi/server/static/ /srv/bodhi-static