diff options
23 files changed, 41 insertions, 39 deletions
diff --git a/server/autobuild b/server/autobuild index d057900..19dff59 100755 --- a/server/autobuild +++ b/server/autobuild @@ -401,6 +401,7 @@ os_gentoo() { sys-devel/automake sys-devel/gcc sys-devel/make + sys-libs/glibc sys-libs/zlib" return 0 } diff --git a/server/test/docker/templates/arch.Dockerfile.in b/server/test/docker/templates/arch.Dockerfile.in deleted file mode 100644 index e227223..0000000 --- a/server/test/docker/templates/arch.Dockerfile.in +++ /dev/null @@ -1,4 +0,0 @@ -# -*- dockerfile -*- -FROM archlinux:latest -RUN pacman -Syu --noconfirm --noprogressbar && \ - pacman -S --noconfirm --noprogressbar poppler-glib base-devel diff --git a/server/test/docker/templates/arch.Dockerfile.in.FAILING b/server/test/docker/templates/arch.Dockerfile.in.FAILING new file mode 100644 index 0000000..a85762b --- /dev/null +++ b/server/test/docker/templates/arch.Dockerfile.in.FAILING @@ -0,0 +1,4 @@ +# -*- dockerfile -*- +FROM archlinux:latest +RUN pacman -Syu --noconfirm --noprogressbar +# @TODO: The official Archlinux image does not seem to have any form of shell. Marking this as FAILING. diff --git a/server/test/docker/templates/centos-7.Dockerfile.in b/server/test/docker/templates/centos-7.Dockerfile.in deleted file mode 100644 index cdebbef..0000000 --- a/server/test/docker/templates/centos-7.Dockerfile.in +++ /dev/null @@ -1,3 +0,0 @@ -# -*- dockerfile -*- -FROM centos:7 -RUN yum update -y && yum install -y gcc poppler-glib-devel diff --git a/server/test/docker/templates/centos.Dockerfile.in.FAILING b/server/test/docker/templates/centos.Dockerfile.in.FAILING new file mode 100644 index 0000000..1da2ab8 --- /dev/null +++ b/server/test/docker/templates/centos.Dockerfile.in.FAILING @@ -0,0 +1,6 @@ +# -*- dockerfile -*- +FROM centos:centos7 +RUN sed -i -e "s|mirrorlist=|#mirrorlist=|g" /etc/yum.repos.d/CentOS-* +RUN sed -i -e "s|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g" /etc/yum.repos.d/CentOS-* +RUN yum update -y +# @TODO: Since CentOS is no more, do I even want to try and fix this? diff --git a/server/test/docker/templates/debian-10.Dockerfile.in b/server/test/docker/templates/debian-10.Dockerfile.in index 139db32..2f01de7 100644 --- a/server/test/docker/templates/debian-10.Dockerfile.in +++ b/server/test/docker/templates/debian-10.Dockerfile.in @@ -1,3 +1,4 @@ # -*- dockerfile -*- +# Debian 10 is known as buster FROM debian:10 -RUN apt-get update -y && apt-get install -y gcc libpoppler-glib-dev +RUN apt-get update -y diff --git a/server/test/docker/templates/debian-11.Dockerfile.in b/server/test/docker/templates/debian-11.Dockerfile.in new file mode 100644 index 0000000..cabb29d --- /dev/null +++ b/server/test/docker/templates/debian-11.Dockerfile.in @@ -0,0 +1,4 @@ +# -*- dockerfile -*- +# Debian 11 is known as bullseye +FROM debian:11 +RUN apt-get update -y diff --git a/server/test/docker/templates/debian-8.Dockerfile.in b/server/test/docker/templates/debian-8.Dockerfile.in deleted file mode 100644 index e7c7a15..0000000 --- a/server/test/docker/templates/debian-8.Dockerfile.in +++ /dev/null @@ -1,3 +0,0 @@ -# -*- dockerfile -*- -FROM debian:8 -RUN apt-get update -y && apt-get install -y gcc libpoppler-glib-dev diff --git a/server/test/docker/templates/debian-9.Dockerfile.in b/server/test/docker/templates/debian-9.Dockerfile.in index db166c3..8f6e341 100644 --- a/server/test/docker/templates/debian-9.Dockerfile.in +++ b/server/test/docker/templates/debian-9.Dockerfile.in @@ -1,3 +1,4 @@ # -*- dockerfile -*- +# Debian 9 is known as stretch FROM debian:9 -RUN apt-get update -y && apt-get install -y gcc libpoppler-glib-dev +RUN apt-get update -y diff --git a/server/test/docker/templates/fedora-32.Dockerfile.in b/server/test/docker/templates/fedora-32.Dockerfile.in deleted file mode 100644 index 1ee8a68..0000000 --- a/server/test/docker/templates/fedora-32.Dockerfile.in +++ /dev/null @@ -1,3 +0,0 @@ -# -*- dockerfile -*- -FROM fedora:32 -RUN dnf update -y && dnf install -y gcc poppler-glib-devel diff --git a/server/test/docker/templates/fedora-33.Dockerfile.in b/server/test/docker/templates/fedora-33.Dockerfile.in deleted file mode 100644 index 13b0ae0..0000000 --- a/server/test/docker/templates/fedora-33.Dockerfile.in +++ /dev/null @@ -1,3 +0,0 @@ -# -*- dockerfile -*- -FROM fedora:33 -RUN dnf update -y && dnf install -y gcc poppler-glib-devel diff --git a/server/test/docker/templates/fedora-34.Dockerfile.in b/server/test/docker/templates/fedora-34.Dockerfile.in index 0a43238..42dc26d 100644 --- a/server/test/docker/templates/fedora-34.Dockerfile.in +++ b/server/test/docker/templates/fedora-34.Dockerfile.in @@ -1,3 +1,3 @@ # -*- dockerfile -*- FROM fedora:34 -RUN dnf update -y && dnf install -y gcc poppler-glib-devel +RUN dnf update -y diff --git a/server/test/docker/templates/fedora-35.Dockerfile.in b/server/test/docker/templates/fedora-35.Dockerfile.in index 1baf076..16a0eb3 100644 --- a/server/test/docker/templates/fedora-35.Dockerfile.in +++ b/server/test/docker/templates/fedora-35.Dockerfile.in @@ -1,3 +1,3 @@ # -*- dockerfile -*- FROM fedora:35 -RUN dnf update -y && dnf install -y gcc poppler-glib-devel +RUN dnf update -y diff --git a/server/test/docker/templates/fedora-36.Dockerfile.in b/server/test/docker/templates/fedora-36.Dockerfile.in new file mode 100644 index 0000000..e795d68 --- /dev/null +++ b/server/test/docker/templates/fedora-36.Dockerfile.in @@ -0,0 +1,3 @@ +# -*- dockerfile -*- +FROM fedora:36 +RUN dnf update -y diff --git a/server/test/docker/templates/gentoo.Dockerfile.in b/server/test/docker/templates/gentoo.Dockerfile.in deleted file mode 100644 index 00ef03f..0000000 --- a/server/test/docker/templates/gentoo.Dockerfile.in +++ /dev/null @@ -1,5 +0,0 @@ -# -*- dockerfile -*- -FROM gentoo/stage3-amd64 -RUN emerge --sync && emerge sys-devel/gcc app-text/poppler - - diff --git a/server/test/docker/templates/gentoo.Dockerfile.in.FAILING b/server/test/docker/templates/gentoo.Dockerfile.in.FAILING new file mode 100644 index 0000000..7e1d520 --- /dev/null +++ b/server/test/docker/templates/gentoo.Dockerfile.in.FAILING @@ -0,0 +1,6 @@ +# -*- dockerfile -*- +FROM gentoo/stage3 +RUN emerge --sync +# IF you see this error, just ignore it: !!! It seems /run is not mounted. Process management may malfunction. +# Note that gentoo takes a **long** time to build and run, that's okay. +# @TODO: Currently, running this errors out because it cannot find glib-2.0, needs fixing. diff --git a/server/test/docker/templates/ubuntu-14.Dockerfile.in b/server/test/docker/templates/ubuntu-14.Dockerfile.in deleted file mode 100644 index 5cd2bbe..0000000 --- a/server/test/docker/templates/ubuntu-14.Dockerfile.in +++ /dev/null @@ -1,3 +0,0 @@ -# -*- dockerfile -*- -FROM ubuntu:trusty -RUN apt-get update -y && apt-get install -y gcc libpoppler-glib-dev diff --git a/server/test/docker/templates/ubuntu-16.Dockerfile.in b/server/test/docker/templates/ubuntu-16.Dockerfile.in deleted file mode 100644 index e166f43..0000000 --- a/server/test/docker/templates/ubuntu-16.Dockerfile.in +++ /dev/null @@ -1,3 +0,0 @@ -# -*- dockerfile -*- -FROM ubuntu:xenial -RUN apt-get update -y && apt-get install -y gcc libpoppler-glib-dev diff --git a/server/test/docker/templates/ubuntu-18.Dockerfile.in b/server/test/docker/templates/ubuntu-18.Dockerfile.in index 5c04f3d..8f4cc6b 100644 --- a/server/test/docker/templates/ubuntu-18.Dockerfile.in +++ b/server/test/docker/templates/ubuntu-18.Dockerfile.in @@ -1,3 +1,5 @@ # -*- dockerfile -*- FROM ubuntu:bionic -RUN apt-get update -y && apt-get install -y gcc libpoppler-glib-dev +ARG DEBIAN_FRONTEND=noninteractive +# Need to install tzdata here to avoid stupid prompts when running package install via autobuild +RUN apt-get update -y && apt-get install -y tzdata diff --git a/server/test/docker/templates/ubuntu-20.10.Dockerfile.in b/server/test/docker/templates/ubuntu-20.10.Dockerfile.in deleted file mode 100644 index ff3294a..0000000 --- a/server/test/docker/templates/ubuntu-20.10.Dockerfile.in +++ /dev/null @@ -1,3 +0,0 @@ -# -*- dockerfile -*- -FROM ubuntu:groovy -RUN apt-get update -y && apt-get install -y gcc libpoppler-glib-dev diff --git a/server/test/docker/templates/ubuntu-20.Dockerfile.in b/server/test/docker/templates/ubuntu-20.Dockerfile.in index a039e5e..515e5f5 100644 --- a/server/test/docker/templates/ubuntu-20.Dockerfile.in +++ b/server/test/docker/templates/ubuntu-20.Dockerfile.in @@ -1,3 +1,5 @@ # -*- dockerfile -*- FROM ubuntu:focal -RUN apt-get update -y && apt-get install -y gcc libpoppler-glib-dev +ARG DEBIAN_FRONTEND=noninteractive +# Need to install tzdata here to avoid stupid prompts when running package install via autobuild +RUN apt-get update -y && apt-get install -y tzdata diff --git a/server/test/docker/templates/ubuntu-21.Dockerfile.in b/server/test/docker/templates/ubuntu-21.Dockerfile.in deleted file mode 100644 index 809d7ed..0000000 --- a/server/test/docker/templates/ubuntu-21.Dockerfile.in +++ /dev/null @@ -1,3 +0,0 @@ -# -*- dockerfile -*- -FROM ubuntu:hirsute -RUN apt-get update -y && apt-get install -y gcc libpoppler-glib-dev diff --git a/server/test/docker/templates/ubuntu-22.Dockerfile.in b/server/test/docker/templates/ubuntu-22.Dockerfile.in new file mode 100644 index 0000000..649752d --- /dev/null +++ b/server/test/docker/templates/ubuntu-22.Dockerfile.in @@ -0,0 +1,5 @@ +# -*- dockerfile -*- +FROM ubuntu:jammy +ARG DEBIAN_FRONTEND=noninteractive +# Need to install tzdata here to avoid stupid prompts when running package install via autobuild +RUN apt-get update -y && apt-get install -y tzdata |