From c04273b40907dcfaf4bd0f4e759694a0f738e926 Mon Sep 17 00:00:00 2001 From: Vedang Manerikar Date: Sun, 30 May 2021 20:34:42 +0530 Subject: Update all the docker template files This work is part of the effort to fix the `test-all` Make target. When I complete all the work, I will update the relevant Circle CI scripts to run these tests as well. Note also that I personally use podman instead of docker, so I'm replacing docker with podman in the scripts. Someday, I might find a clever way to let both co-exist --- server/test/Makefile | 4 ++-- server/test/docker/templates/arch.Dockerfile.in | 4 +--- server/test/docker/templates/debian-10.Dockerfile.in | 3 +++ server/test/docker/templates/fedora-24.Dockerfile.in | 5 ----- server/test/docker/templates/fedora-25.Dockerfile.in | 5 ----- server/test/docker/templates/fedora-26.Dockerfile.in | 5 ----- server/test/docker/templates/fedora-32.Dockerfile.in | 3 +++ server/test/docker/templates/fedora-33.Dockerfile.in | 3 +++ server/test/docker/templates/fedora-34.Dockerfile.in | 3 +++ server/test/docker/templates/fedora-35.Dockerfile.in | 3 +++ server/test/docker/templates/ubuntu-17.Dockerfile.in | 4 ---- server/test/docker/templates/ubuntu-18.Dockerfile.in | 3 +++ server/test/docker/templates/ubuntu-20.10.Dockerfile.in | 3 +++ server/test/docker/templates/ubuntu-20.Dockerfile.in | 3 +++ server/test/docker/templates/ubuntu-21.Dockerfile.in | 3 +++ 15 files changed, 30 insertions(+), 24 deletions(-) create mode 100644 server/test/docker/templates/debian-10.Dockerfile.in delete mode 100644 server/test/docker/templates/fedora-24.Dockerfile.in delete mode 100644 server/test/docker/templates/fedora-25.Dockerfile.in delete mode 100644 server/test/docker/templates/fedora-26.Dockerfile.in create mode 100644 server/test/docker/templates/fedora-32.Dockerfile.in create mode 100644 server/test/docker/templates/fedora-33.Dockerfile.in create mode 100644 server/test/docker/templates/fedora-34.Dockerfile.in create mode 100644 server/test/docker/templates/fedora-35.Dockerfile.in delete mode 100644 server/test/docker/templates/ubuntu-17.Dockerfile.in create mode 100644 server/test/docker/templates/ubuntu-18.Dockerfile.in create mode 100644 server/test/docker/templates/ubuntu-20.10.Dockerfile.in create mode 100644 server/test/docker/templates/ubuntu-20.Dockerfile.in create mode 100644 server/test/docker/templates/ubuntu-21.Dockerfile.in 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/debian-10.Dockerfile.in b/server/test/docker/templates/debian-10.Dockerfile.in new file mode 100644 index 0000000..1808b78 --- /dev/null +++ b/server/test/docker/templates/debian-10.Dockerfile.in @@ -0,0 +1,3 @@ +# -*- dockerfile -*- +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-24.Dockerfile.in deleted file mode 100644 index a2490ad..0000000 --- a/server/test/docker/templates/fedora-24.Dockerfile.in +++ /dev/null @@ -1,5 +0,0 @@ -# -*- dockerfile -*- -FROM fedora:24 -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-25.Dockerfile.in deleted file mode 100644 index 6f5f8c2..0000000 --- a/server/test/docker/templates/fedora-25.Dockerfile.in +++ /dev/null @@ -1,5 +0,0 @@ -# -*- dockerfile -*- -FROM fedora:25 -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-26.Dockerfile.in deleted file mode 100644 index 8c43d1d..0000000 --- a/server/test/docker/templates/fedora-26.Dockerfile.in +++ /dev/null @@ -1,5 +0,0 @@ -# -*- dockerfile -*- -FROM fedora:26 -RUN dnf update -y && dnf install -y gcc gcc-c++ poppler-glib-devel - - diff --git a/server/test/docker/templates/fedora-32.Dockerfile.in b/server/test/docker/templates/fedora-32.Dockerfile.in new file mode 100644 index 0000000..46a0907 --- /dev/null +++ b/server/test/docker/templates/fedora-32.Dockerfile.in @@ -0,0 +1,3 @@ +# -*- dockerfile -*- +FROM fedora:32 +RUN dnf update -y && dnf install -y gcc gcc-c++ poppler-glib-devel diff --git a/server/test/docker/templates/fedora-33.Dockerfile.in b/server/test/docker/templates/fedora-33.Dockerfile.in new file mode 100644 index 0000000..06cae7b --- /dev/null +++ b/server/test/docker/templates/fedora-33.Dockerfile.in @@ -0,0 +1,3 @@ +# -*- dockerfile -*- +FROM fedora:33 +RUN dnf update -y && dnf install -y gcc gcc-c++ poppler-glib-devel diff --git a/server/test/docker/templates/fedora-34.Dockerfile.in b/server/test/docker/templates/fedora-34.Dockerfile.in new file mode 100644 index 0000000..63e6abb --- /dev/null +++ b/server/test/docker/templates/fedora-34.Dockerfile.in @@ -0,0 +1,3 @@ +# -*- dockerfile -*- +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-17.Dockerfile.in b/server/test/docker/templates/ubuntu-17.Dockerfile.in deleted file mode 100644 index bf2dc3d..0000000 --- a/server/test/docker/templates/ubuntu-17.Dockerfile.in +++ /dev/null @@ -1,4 +0,0 @@ -# -*- dockerfile -*- -FROM ubuntu:artful -RUN apt-get update -y && apt-get install -y gcc g++ libpoppler-glib-dev - 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 -- cgit v1.0