tests/docker: auto-generate centos8.docker with lcitool

This commit is best examined using the "-b" option to diff.

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20211215141949.3512719-9-berrange@redhat.com>
Message-Id: <20220105135009.1584676-9-alex.bennee@linaro.org>

tests/docker/dockerfiles/centos8.docker

@@ -1,9 +1,20 @@
-FROM docker.io/centos:8
+# THIS FILE WAS AUTO-GENERATED
+#
+#  $ lcitool dockerfile centos-8 qemu
+#
+# https://gitlab.com/libvirt/libvirt-ci
 
-RUN dnf -y update
-ENV PACKAGES \
+FROM docker.io/library/centos:8
+
+RUN dnf update -y && \
+    dnf install 'dnf-command(config-manager)' -y && \
+    dnf config-manager --set-enabled -y powertools && \
+    dnf install -y centos-release-advanced-virtualization && \
+    dnf install -y epel-release && \
+    dnf install -y \
         SDL2-devel \
         alsa-lib-devel \
+        bash \
         bc \
         brlapi-devel \
         bzip2 \
@@ -25,6 +36,7 @@ ENV PACKAGES \
         gettext \
         git \
         glib2-devel \
+        glib2-static \
         glibc-langpack-en \
         glibc-static \
         glusterfs-api-devel \
@@ -57,13 +69,16 @@ ENV PACKAGES \
         libtasn1-devel \
         libubsan \
         libudev-devel \
+        liburing-devel \
         libusbx-devel \
         libxml2-devel \
         libzstd-devel \
         llvm \
+        lttng-ust-devel \
         lzo-devel \
         make \
         mesa-libgbm-devel \
+        meson \
         ncurses-devel \
         nettle-devel \
         ninja-build \
@@ -71,6 +86,7 @@ ENV PACKAGES \
         numactl-devel \
         openssh-clients \
         pam-devel \
+        pcre-static \
         perl \
         perl-Test-Harness \
         pixman-devel \
@@ -81,11 +97,9 @@ ENV PACKAGES \
         python3-numpy \
         python3-pillow \
         python3-pip \
-    python3-setuptools \
         python3-sphinx \
         python3-sphinx_rtd_theme \
         python3-virtualenv \
-    python3-wheel \
         rdma-core-devel \
         rpm \
         sed \
@@ -102,11 +116,20 @@ ENV PACKAGES \
         vte291-devel \
         which \
         xfsprogs-devel \
-    zlib-devel
+        zlib-devel \
+        zlib-static && \
+    dnf autoremove -y && \
+    dnf clean all -y && \
+    rpm -qa | sort > /packages.txt && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
 
-RUN dnf install -y dnf-plugins-core && \
-  dnf config-manager --set-enabled powertools && \
-  dnf install -y centos-release-advanced-virtualization && \
-  dnf install -y epel-release && \
-  dnf install -y $PACKAGES
-RUN rpm -q $PACKAGES | sort > /packages.txt
+ENV LANG "en_US.UTF-8"
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"

tests/lcitool/refresh

@@ -61,6 +61,8 @@ def generate_dockerfile(host, target, cross=None, trailer=None):
    generate(filename, cmd, trailer)
 
 try:
+   generate_dockerfile("centos8", "centos-8")
+
    sys.exit(0)
 except Exception as ex:
    print(str(ex), file=sys.stderr)