11 files changed, 22 insertions, 16 deletions
diff --git a/server/test/Makefile b/server/test/Makefile
index 7069c6b..95668dc 100644
--- a/server/test/Makefile
+++ b/server/test/Makefile
@@ -27,13 +27,13 @@ docker/%.Dockerfile: docker/templates/%.Dockerfile.in \
 # Build the Dockerfile
 docker/.%.build: docker/%.Dockerfile ../autobuild docker/lib
 	@echo Building target $*
-	docker build $(DOCKER_BUILD_ARGS) -t epdfinfo/$* -f $< ../
+	podman build $(DOCKER_BUILD_ARGS) -t epdfinfo/$* -f $< ../
 	touch $@
 
 # Run the Dockerfile
 docker/%: docker/.%.build
 	@echo Running tests on target $*
-	docker run epdfinfo/$*
+	podman run epdfinfo/$*
 
 # Run all Dockerfiles
 docker/test: docker/build $(patsubst %, docker/%, $(DOCKER_OS))
diff --git a/server/test/docker/templates/arch.Dockerfile.in b/server/test/docker/templates/arch.Dockerfile.in
index 50e6658..e227223 100644
--- a/server/test/docker/templates/arch.Dockerfile.in
+++ b/server/test/docker/templates/arch.Dockerfile.in
@@ -1,6 +1,4 @@
 # -*- dockerfile -*-
-FROM base/archlinux
+FROM archlinux:latest
 RUN pacman -Syu --noconfirm --noprogressbar && \
     pacman -S --noconfirm --noprogressbar poppler-glib base-devel
-
-
diff --git a/server/test/docker/templates/ubuntu-17.Dockerfile.in b/server/test/docker/templates/debian-10.Dockerfile.in
index bf2dc3d..1808b78 100644
--- a/server/test/docker/templates/ubuntu-17.Dockerfile.in
+++ b/server/test/docker/templates/debian-10.Dockerfile.in
@@ -1,4 +1,3 @@
 # -*- dockerfile -*-
-FROM ubuntu:artful
+FROM debian:10
 RUN apt-get update -y && apt-get install -y gcc g++ libpoppler-glib-dev
-
diff --git a/server/test/docker/templates/fedora-24.Dockerfile.in b/server/test/docker/templates/fedora-32.Dockerfile.in
index a2490ad..46a0907 100644
--- a/server/test/docker/templates/fedora-24.Dockerfile.in
+++ b/server/test/docker/templates/fedora-32.Dockerfile.in
@@ -1,5 +1,3 @@
 # -*- dockerfile -*-
-FROM fedora:24
+FROM fedora:32
 RUN dnf update -y && dnf install -y gcc gcc-c++ poppler-glib-devel
-
-
diff --git a/server/test/docker/templates/fedora-25.Dockerfile.in b/server/test/docker/templates/fedora-33.Dockerfile.in
index 6f5f8c2..06cae7b 100644
--- a/server/test/docker/templates/fedora-25.Dockerfile.in
+++ b/server/test/docker/templates/fedora-33.Dockerfile.in
@@ -1,5 +1,3 @@
 # -*- dockerfile -*-
-FROM fedora:25
+FROM fedora:33
 RUN dnf update -y && dnf install -y gcc gcc-c++ poppler-glib-devel
-
-
diff --git a/server/test/docker/templates/fedora-26.Dockerfile.in b/server/test/docker/templates/fedora-34.Dockerfile.in
index 8c43d1d..63e6abb 100644
--- a/server/test/docker/templates/fedora-26.Dockerfile.in
+++ b/server/test/docker/templates/fedora-34.Dockerfile.in
@@ -1,5 +1,3 @@
 # -*- dockerfile -*-
-FROM fedora:26
+FROM fedora:34
 RUN dnf update -y && dnf install -y gcc gcc-c++ poppler-glib-devel
-
-
diff --git a/server/test/docker/templates/fedora-35.Dockerfile.in b/server/test/docker/templates/fedora-35.Dockerfile.in
new file mode 100644
index 0000000..09a25b2
--- /dev/null
+++ b/server/test/docker/templates/fedora-35.Dockerfile.in
@@ -0,0 +1,3 @@
+# -*- dockerfile -*-
+FROM fedora:35
+RUN dnf update -y && dnf install -y gcc gcc-c++ poppler-glib-devel
diff --git a/server/test/docker/templates/ubuntu-18.Dockerfile.in b/server/test/docker/templates/ubuntu-18.Dockerfile.in
new file mode 100644
index 0000000..a445804
--- /dev/null
+++ b/server/test/docker/templates/ubuntu-18.Dockerfile.in
@@ -0,0 +1,3 @@
+# -*- dockerfile -*-
+FROM ubuntu:bionic
+RUN apt-get update -y && apt-get install -y gcc g++ libpoppler-glib-dev
diff --git a/server/test/docker/templates/ubuntu-20.10.Dockerfile.in b/server/test/docker/templates/ubuntu-20.10.Dockerfile.in
new file mode 100644
index 0000000..1235de3
--- /dev/null
+++ b/server/test/docker/templates/ubuntu-20.10.Dockerfile.in
@@ -0,0 +1,3 @@
+# -*- dockerfile -*-
+FROM ubuntu:groovy
+RUN apt-get update -y && apt-get install -y gcc g++ libpoppler-glib-dev
diff --git a/server/test/docker/templates/ubuntu-20.Dockerfile.in b/server/test/docker/templates/ubuntu-20.Dockerfile.in
new file mode 100644
index 0000000..80053e8
--- /dev/null
+++ b/server/test/docker/templates/ubuntu-20.Dockerfile.in
@@ -0,0 +1,3 @@
+# -*- dockerfile -*-
+FROM ubuntu:focal
+RUN apt-get update -y && apt-get install -y gcc g++ libpoppler-glib-dev
diff --git a/server/test/docker/templates/ubuntu-21.Dockerfile.in b/server/test/docker/templates/ubuntu-21.Dockerfile.in
new file mode 100644
index 0000000..b4f462f
--- /dev/null
+++ b/server/test/docker/templates/ubuntu-21.Dockerfile.in
@@ -0,0 +1,3 @@
+# -*- dockerfile -*-
+FROM ubuntu:hirsute
+RUN apt-get update -y && apt-get install -y gcc g++ libpoppler-glib-dev