Bumped the Fedora version up to 32.

We bump up the Fedora version, since v30 has reached its EOL on
2020-05-26.

14 files changed, 15 insertions, 15 deletions

diff --git a/testing/docker/fedora30/build/Dockerfile b/testing/docker/fedora32/build/Dockerfile
index c62037b..8d31d29 100644
--- a/testing/docker/fedora30/build/Dockerfile
+++ b/testing/docker/fedora32/build/Dockerfile
@@ -1,10 +1,10 @@
-# Building an SCons Release Build image under Fedora 30
-FROM fedora:30
+# Building an SCons Release Build image under Fedora 32
+FROM fedora:32
 
-LABEL version="0.0.1" maintainer="Dirk Baechle <dl9obn@darc.de>" description="SCons Release Build, based on a Fedora 30"
+LABEL version="0.0.1" maintainer="Dirk Baechle <dl9obn@darc.de>" description="SCons Release Build, based on a Fedora 32"
 
 # Install additional packages
-RUN dnf -y install git python3-lxml fop fontbox python3-devel lynx xterm vim vim-common nano
+RUN dnf -y install git python3-lxml fop fontbox python3-devel lynx xterm vim vim-common nano unzip
 
 # Install hyphenation patterns for FOP
 RUN mkdir /opt/offo && cd /opt/offo && curl -L --output offo-hyphenation-compiled.zip https://sourceforge.net/projects/offo/files/offo-hyphenation/2.2/offo-hyphenation-compiled.zip/download && unzip offo-hyphenation-compiled.zip && cp offo-hyphenation-compiled/fop-hyph.jar /usr/share/fop/
diff --git a/testing/docker/fedora30/build/build_image.sh b/testing/docker/fedora32/build/build_image.sh
index afd04b8..cad4c84 100755
--- a/testing/docker/fedora30/build/build_image.sh
+++ b/testing/docker/fedora32/build/build_image.sh
@@ -10,7 +10,7 @@ cd $WD
 
 # call docker build passing any other build options (command line options may override!)
 docker build --network=host --file Dockerfile \
-  -t scons-build-fedora30:latest -t scons-build-fedora30:0.0.1 "$@" .
+  -t scons-build-fedora32:latest -t scons-build-fedora32:0.0.1 "$@" .
 
 cd $OLD_WD
 
diff --git a/testing/docker/fedora30/build/docker-compose.yml b/testing/docker/fedora32/build/docker-compose.yml
index 86f3031..1b0b8d0 100644
--- a/testing/docker/fedora30/build/docker-compose.yml
+++ b/testing/docker/fedora32/build/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
 
 services:
   build:
-    image: scons-build-fedora30:latest
+    image: scons-build-fedora32:latest
     restart: always
     environment:
       - DISPLAY
@@ -15,7 +15,7 @@ services:
       - /etc/shadow:/etc/shadow:ro
       - /etc/group:/etc/group:ro
       - ./startup:/startup
-    container_name: SCons_Build_Fedora30
+    container_name: SCons_Build_Fedora32
     entrypoint: /startup/setup_container.sh
     user: $DOCKERUID:$DOCKERGID
     working_dir: $HOME
diff --git a/testing/docker/fedora30/build/readme.rst b/testing/docker/fedora32/build/readme.rst
index 18ac401..d593fe6 100644
--- a/testing/docker/fedora30/build/readme.rst
+++ b/testing/docker/fedora32/build/readme.rst
@@ -3,7 +3,7 @@ Image for building/releasing SCons
 ==================================
 
 This folder contains the files and scripts that can be used to
-build and release SCons, based on a Fedora 30.
+build and release SCons, based on a Fedora 32.
 
 Building the image
 ==================
diff --git a/testing/docker/fedora30/build/start_build_shell.sh b/testing/docker/fedora32/build/start_build_shell.sh
index 6905634..6905634 100755
--- a/testing/docker/fedora30/build/start_build_shell.sh
+++ b/testing/docker/fedora32/build/start_build_shell.sh
diff --git a/testing/docker/fedora30/test/startup/setup_container.sh b/testing/docker/fedora32/build/startup/setup_container.sh
index f655441..f655441 100755
--- a/testing/docker/fedora30/test/startup/setup_container.sh
+++ b/testing/docker/fedora32/build/startup/setup_container.sh
diff --git a/testing/docker/fedora30/build/stop_build_shell.sh b/testing/docker/fedora32/build/stop_build_shell.sh
index c0a9707..c0a9707 100755
--- a/testing/docker/fedora30/build/stop_build_shell.sh
+++ b/testing/docker/fedora32/build/stop_build_shell.sh
diff --git a/testing/docker/fedora30/test/Dockerfile b/testing/docker/fedora32/test/Dockerfile
index 20a0749..694810e 100644
--- a/testing/docker/fedora30/test/Dockerfile
+++ b/testing/docker/fedora32/test/Dockerfile
@@ -1,7 +1,7 @@
-# Building an SCons Test image under Fedora 30
-FROM fedora:30
+# Building an SCons Test image under Fedora 32
+FROM fedora:32
 
-LABEL version="0.0.1" maintainer="Dirk Baechle <dl9obn@darc.de>" description="SCons Test image, based on a Fedora 30"
+LABEL version="0.0.1" maintainer="Dirk Baechle <dl9obn@darc.de>" description="SCons Test image, based on a Fedora 32"
 
 # Install additional packages
 RUN dnf -y install git bison cvs flex g++ gcc ghostscript m4 openssh-clients openssh-server python3-line_profiler python3-devel pypy3-devel rpm-build rcs java-1.8.0-openjdk swig texlive-scheme-basic texlive-base texlive-latex zip xterm vim vim-common nano
diff --git a/testing/docker/fedora30/test/build_image.sh b/testing/docker/fedora32/test/build_image.sh
index 5e1eaba..9a97878 100755
--- a/testing/docker/fedora30/test/build_image.sh
+++ b/testing/docker/fedora32/test/build_image.sh
@@ -10,7 +10,7 @@ cd $WD
 
 # call docker build passing any other build options (command line options may override!)
 docker build --network=host --file Dockerfile \
-  -t scons-test-fedora30:latest -t scons-test-fedora30:0.0.1 "$@" .
+  -t scons-test-fedora32:latest -t scons-test-fedora32:0.0.1 "$@" .
 
 cd $OLD_WD
 
diff --git a/testing/docker/fedora30/test/docker-compose.yml b/testing/docker/fedora32/test/docker-compose.yml
index 25daa18..7d25992 100644
--- a/testing/docker/fedora30/test/docker-compose.yml
+++ b/testing/docker/fedora32/test/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
 
 services:
   build:
-    image: scons-test-fedora30:latest
+    image: scons-test-fedora32:latest
     restart: always
     environment:
       - DISPLAY
@@ -15,7 +15,7 @@ services:
       - /etc/shadow:/etc/shadow:ro
       - /etc/group:/etc/group:ro
       - ./startup:/startup
-    container_name: SCons_Test_Fedora30
+    container_name: SCons_Test_Fedora32
     entrypoint: /startup/setup_container.sh
     user: $DOCKERUID:$DOCKERGID
     working_dir: $HOME
diff --git a/testing/docker/fedora30/test/readme.rst b/testing/docker/fedora32/test/readme.rst
index 8cba2e9..da91176 100644
--- a/testing/docker/fedora30/test/readme.rst
+++ b/testing/docker/fedora32/test/readme.rst
@@ -3,7 +3,7 @@ Image for testing SCons
 =======================
 
 This folder contains the files and scripts that can be used to
-test SCons, based on a Fedora 30.
+test SCons, based on a Fedora 32.
 
 Building the image
 ==================
diff --git a/testing/docker/fedora30/test/start_test_shell.sh b/testing/docker/fedora32/test/start_test_shell.sh
index 6905634..6905634 100755
--- a/testing/docker/fedora30/test/start_test_shell.sh
+++ b/testing/docker/fedora32/test/start_test_shell.sh
diff --git a/testing/docker/fedora30/build/startup/setup_container.sh b/testing/docker/fedora32/test/startup/setup_container.sh
index f655441..f655441 100755
--- a/testing/docker/fedora30/build/startup/setup_container.sh
+++ b/testing/docker/fedora32/test/startup/setup_container.sh
diff --git a/testing/docker/fedora30/test/stop_test_shell.sh b/testing/docker/fedora32/test/stop_test_shell.sh
index c0a9707..c0a9707 100755
--- a/testing/docker/fedora30/test/stop_test_shell.sh
+++ b/testing/docker/fedora32/test/stop_test_shell.sh