From b697865d35f46db5ea681cebae46b21f68e65432 Mon Sep 17 00:00:00 2001
From: lightlace <fabian.baumanis@gmx.de>
Date: Nov 06 2019 10:58:51 +0000
Subject: [PATCH 1/2] Update Dockerfile to Fedora 31 and Python3


---

diff --git a/Dockerfile b/Dockerfile
index e9a4236..03d10b5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,25 +1,25 @@
-FROM fedora:29
+FROM fedora:31
 
 WORKDIR /opt/sites/getfedora.org/
 
 RUN dnf -y install \
-    python-flask \
-    python-frozen-flask \
-    python-flask-assets \
-    python-rjsmin \
-    python-cssmin \
-    python-flask-babel \
-    python-flask-htmlmin \
-    python-cssutils \
+    python3-flask \
+    python3-frozen-flask \
+    python3-flask-assets \
+    python3-rjsmin \
+    python3-cssmin \
+    python3-flask-babel \
+    python3-flask-htmlmin \
+    python3-cssutils \
     rubygem-sass \
     babel \
     python3-jinja2 \
-    python-pyyaml \
-    python-dateutil \
-    python-dogpile-cache \
-    python-requests \
-    python-fedfind \
-    python-zanata-client && \
+    python3-pyyaml \
+    python3-dateutil \
+    python3-dogpile-cache \
+    python3-requests \
+    python3-fedfind \
+    python3-zanata-client && \
       dnf clean all
 
 ENV FLASK_APP main.py

From d75050b2665436ee325d9f9a84b92ece4600d78e Mon Sep 17 00:00:00 2001
From: lightlace <fabian.baumanis@gmx.de>
Date: Nov 06 2019 11:00:36 +0000
Subject: [PATCH 2/2] Remove python3 option from build-prod.sh


---

diff --git a/build-prod.sh b/build-prod.sh
index 745a784..c45c59d 100755
--- a/build-prod.sh
+++ b/build-prod.sh
@@ -5,10 +5,6 @@ SKIPTRANS="no"
 while true
 do
 	case "$1" in
-	--py3)
-		PYBINARY="python3"
-		shift
-		;;
 	--skip-trans)
 		SKIPTRANS="yes"
 		shift
@@ -21,7 +17,7 @@ done
 
 if [ ! "$#" -eq 1 -o ! -d "$1" ];
 then
-	echo "Usage: $0 [--py3] [--skip-trans] <output-dir>"
+	echo "Usage: $0 [--skip-trans] <output-dir>"
 	exit 1
 fi
 OUTDIR="$1"