From 0553f2438b8694a66f934e930452fcb2e8136e66 Mon Sep 17 00:00:00 2001
From: Lukas Holecek <hluk@email.cz>
Date: Jul 29 2020 05:32:15 +0000
Subject: Update base image to Fedora 32


Fixes #387
Signed-off-by: Lukas Holecek <hluk@email.cz>

---

diff --git a/Dockerfile b/Dockerfile
index 23d1e9a..8721eae 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:29
+FROM fedora:32
 LABEL \
     name="WaiverDB application" \
     vendor="WaiverDB developers" \
diff --git a/openshift/containers/jenkins-slave/Dockerfile b/openshift/containers/jenkins-slave/Dockerfile
index 195ed54..7bff8fb 100644
--- a/openshift/containers/jenkins-slave/Dockerfile
+++ b/openshift/containers/jenkins-slave/Dockerfile
@@ -2,7 +2,7 @@
 # https://github.com/jenkinsci/docker-jnlp-slave/blob/master/Dockerfile
 # https://github.com/jenkinsci/docker-slave/blob/master/Dockerfile
 
-FROM fedora:31
+FROM fedora:32
 LABEL \
     org.opencontainers.image.title="Jenkins agent image for WaiverDB" \
     org.opencontainers.image.description="Jenkins slave for WaiverDB dev tests" \
@@ -14,12 +14,15 @@ ARG UID=10000
 ARG HOME_DIR=/home/jenkins
 ARG REMOTING_VERSION=3.36
 ARG TINI_VERSION=0.18.0
-ARG DNF_CMD="dnf -y --setopt=deltarpm=0 --setopt=install_weak_deps=false --setopt=tsflags=nodocs"
 ARG CA_URLS=""
 
 USER root
 
-RUN ${DNF_CMD} install -y \
+RUN dnf -y \
+    --setopt=deltarpm=0 \
+    --setopt=install_weak_deps=false \
+    --setopt=tsflags=nodocs \
+    install \
     java-1.8.0-openjdk-headless gettext git-core \
     tar gzip skopeo wget make bind-utils \
     origin-clients python3-jinja2-cli \
@@ -40,8 +43,8 @@ RUN for ca_url in ${CA_URLS}; do curl -skO ${ca_url}; done && \
 # install build dependencies for WaiverDB
 COPY waiverdb.spec /usr/local/src/waiverdb/waiverdb.spec
 RUN cd /usr/local/src/waiverdb \
-  && ${DNF_CMD} builddep waiverdb.spec \
-  && ${DNF_CMD} clean all \
+  && dnf -y builddep waiverdb.spec \
+  && dnf -y clean all \
   && cd / && rm -rf /usr/local/src/waiverdb
 
 # Setup the user for non-arbitrary UIDs with OpenShift
@@ -69,7 +72,7 @@ RUN curl -L -o /usr/local/bin/tini "https://github.com/krallin/tini/releases/dow
     && chmod +rx /usr/local/bin/tini \
     && curl -L -o /usr/local/bin/wait-for-it "https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh" \
     && chmod +rx /usr/local/bin/tini /usr/local/bin/wait-for-it \
-    && ${DNF_CMD} clean all
+    && dnf -y clean all
 
 # For OpenShift we MUST use the UID of the user and not the name.
 USER ${UID}
diff --git a/openshift/containers/waiverdb/Dockerfile b/openshift/containers/waiverdb/Dockerfile
index 5c2358c..f5065e9 100644
--- a/openshift/containers/waiverdb/Dockerfile
+++ b/openshift/containers/waiverdb/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:31
+FROM fedora:32
 LABEL \
     name="waiverdb" \
     maintainer="WaiverDB developers" \
diff --git a/tests/test_api_v10.py b/tests/test_api_v10.py
index 06b5d7f..4cab225 100644
--- a/tests/test_api_v10.py
+++ b/tests/test_api_v10.py
@@ -259,10 +259,7 @@ def test_404_for_nonexistent_waiver(client, session):
     r = client.get('/api/v1.0/waivers/foo')
     assert r.status_code == 404
     res_data = json.loads(r.get_data(as_text=True))
-    message = (
-        'The requested URL was not found on the server.  If you entered the '
-        'URL manually please check your spelling and try again.')
-    assert res_data['message'] == message
+    assert 'The requested URL was not found on the server' in res_data['message']
 
 
 @patch('waiverdb.api_v1.AboutResource.get', side_effect=ConnectionError)