From db3c0785cba8649692f49be6b7fae2c8e7b850c8 Mon Sep 17 00:00:00 2001
From: Clement Verna <cverna@tutanota.com>
Date: Mon, 2 Mar 2020 17:08:52 +0100
Subject: [PATCH] bodhi: patch error templates while waiting for a release

Signed-off-by: Clement Verna <cverna@tutanota.com>
---
 files/bodhi/errors.html                            | 14 ++++++++++++++
 .../openshift-apps/bodhi/templates/dockerfile-base |  5 +++--
 2 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 files/bodhi/errors.html

diff --git a/files/bodhi/errors.html b/files/bodhi/errors.html
new file mode 100644
index 0000000000..a026b42dd3
--- /dev/null
+++ b/files/bodhi/errors.html
@@ -0,0 +1,14 @@
+<%inherit file="master.html"/>
+
+<div class="container">
+  <div class="row">
+    <div class="offset-3 col-md-6">
+      <div class="panel error-page-panel">
+        <h1>${status} <small>${summary}</small></h1>
+        % for error in errors:
+        <p class="lead">${error['description'] | h}</p>
+        % endfor
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/roles/openshift-apps/bodhi/templates/dockerfile-base b/roles/openshift-apps/bodhi/templates/dockerfile-base
index a7be216212..427e149f66 100644
--- a/roles/openshift-apps/bodhi/templates/dockerfile-base
+++ b/roles/openshift-apps/bodhi/templates/dockerfile-base
@@ -51,10 +51,11 @@ RUN git clone -b staging https://github.com/fedora-infra/bodhi.git /srv/bodhi &&
     cd /srv/bodhi && \
     python3 -m pip install . --no-use-pep517 && \
     mkdir -p /usr/share/bodhi && \
-    cp /srv/bodhi/apache/bodhi.wsgi /usr/share/bodhi/bodhi.wsgi
+    cp /srv/bodhi/apache/bodhi.wsgi /usr/share/bodhi/bodhi.wsgi &&\
+    curl -o /usr/lib/python3.7/site-packages/bodhi/server/templates/errors.html https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/bodhi/errors.html
 
 RUN rm -f /etc/krb5.conf && \
     ln -sf /etc/bodhi/krb5.conf /etc/krb5.conf && \
     ln -sf /etc/keytabs/koji-keytab /etc/krb5.bodhi_bodhi.fedoraproject.org.keytab
 
-ENV USER=openshift
\ No newline at end of file
+ENV USER=openshift