From 9b1336960b307a2a81d6232f0ce40f40dfb0f83a Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Mar 02 2020 16:08:52 +0000 Subject: bodhi: patch error templates while waiting for a release Signed-off-by: Clement Verna --- diff --git a/files/bodhi/errors.html b/files/bodhi/errors.html new file mode 100644 index 0000000..a026b42 --- /dev/null +++ b/files/bodhi/errors.html @@ -0,0 +1,14 @@ +<%inherit file="master.html"/> + +
+
+
+
+

${status} ${summary}

+ % for error in errors: +

${error['description'] | h}

+ % endfor +
+
+
+
diff --git a/roles/openshift-apps/bodhi/templates/dockerfile-base b/roles/openshift-apps/bodhi/templates/dockerfile-base index a7be216..427e149 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