Update test zoo docker images

* Add Fedora 42
* Remove Fedora 40
* Remove Ubuntu 20.04

Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>

.github/workflows/tests.yaml

@@ -24,12 +24,12 @@ jobs:
           - name: "Debian Testing"
             runner: ubuntu-latest
             container: debiantesting
-          - name: "Fedora 40"
-            runner: ubuntu-latest
-            container: fedora40
           - name: "Fedora 41"
             runner: ubuntu-latest
             container: fedora41
+          - name: "Fedora 42"
+            runner: ubuntu-latest
+            container: fedora42
           - name: "OpenSUSE Leap"
             runner: ubuntu-latest
             container: opensuseleap

docker-compose.yml

@@ -47,14 +47,6 @@ services:
     security_opt:
       - label=type:container_runtime_t
     tty: true
-  test-fedora40:
-    build:
-      context: .
-      dockerfile: test/docker/fedora40
-    network_mode: "host"
-    security_opt:
-      - label=type:container_runtime_t
-    tty: true
   test-fedora41:
     build:
       context: .
@@ -63,6 +55,14 @@ services:
     security_opt:
       - label=type:container_runtime_t
     tty: true
+  test-fedora42:
+    build:
+      context: .
+      dockerfile: test/docker/fedora42
+    network_mode: "host"
+    security_opt:
+      - label=type:container_runtime_t
+    tty: true
   test-opensuseleap:
     build:
       context: .
@@ -79,14 +79,6 @@ services:
     security_opt:
       - label=type:container_runtime_t
     tty: true
-  test-ubuntu2004:
-    build:
-      context: .
-      dockerfile: test/docker/ubuntu2004
-    network_mode: "host"
-    security_opt:
-      - label=type:container_runtime_t
-    tty: true
   test-ubuntu2204:
     build:
       context: .

test/docker/fedora42

@@ -1,4 +1,4 @@
-FROM fedora:40
+FROM fedora:42
 
 RUN dnf update -y
 RUN dnf install -y \

test/docker/ubuntu2004

@@ -1,42 +0,0 @@
-FROM ubuntu:20.04
-
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN apt-get update && yes | unminimize
-RUN apt-get install -y \
-            asciidoctor \
-            cmake \
-            g++ \
-            git \
-            locales \
-            man \
-            man-db \
-            python3 \
-            python3-dateutil \
-            tzdata
-
-# Setup environment
-RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 10
-RUN ln -fs /usr/share/zoneinfo/Europe/Berlin /etc/localtime
-RUN dpkg-reconfigure -f noninteractive tzdata
-
-ENV LC_ALL en_US.UTF-8
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US.UTF-8
-RUN locale-gen "en_US.UTF-8"
-
-# Setup timewarrior
-ADD . /root/code/
-WORKDIR /root/code/
-RUN git clean -dfx
-RUN git submodule init
-RUN git submodule update
-RUN cmake -DCMAKE_BUILD_TYPE=debug .
-RUN make -j2
-RUN make install
-
-# Setup tests
-WORKDIR /root/code/test/
-RUN make -j2
-
-CMD ["bash", "-c", "./run_all -v ; cat all.log | grep 'not ok' ; ./problems ; FAILED=$? ; echo timew $( timew --version ) ; python --version ; cmake --version ; gcc --version ; asciidoctor --version ; exit $FAILED"]