gitlab: refresh containers with lcitool for fully minimized base

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

11 files changed, 4 insertions, 140 deletions

diff --git a/ci/containers/libvirt-centos-7.Dockerfile b/ci/containers/libvirt-centos-7.Dockerfile
index 4562c4c..0aac9c0 100644
--- a/ci/containers/libvirt-centos-7.Dockerfile
+++ b/ci/containers/libvirt-centos-7.Dockerfile
@@ -33,24 +33,15 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\
     yum install -y epel-release && \
     yum update -y && \
     yum install -y \
-        bash \
-        bash-completion \
         ca-certificates \
         ccache \
         gcc \
-        gettext \
         git \
         glibc-common \
-        glibc-devel \
         libvirt-devel \
-        patch \
-        perl \
-        perl-App-cpanminus \
         pkgconfig \
         python3 \
-        python3-pip \
         python3-setuptools \
-        python3-wheel \
         python36-devel \
         python36-lxml \
         python36-nose \
@@ -62,9 +53,5 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
 ENV LANG "en_US.UTF-8"
-
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja-build"
 ENV PYTHON "/usr/bin/python3"
-
 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/ci/containers/libvirt-centos-8.Dockerfile b/ci/containers/libvirt-centos-8.Dockerfile
index 728d975..03bd8f1 100644
--- a/ci/containers/libvirt-centos-8.Dockerfile
+++ b/ci/containers/libvirt-centos-8.Dockerfile
@@ -6,8 +6,6 @@ RUN dnf install 'dnf-command(config-manager)' -y && \
     dnf install -y epel-release && \
     dnf update -y && \
     dnf install -y \
-        bash \
-        bash-completion \
         ca-certificates \
         ccache \
         gcc \
@@ -25,9 +23,7 @@ RUN dnf install 'dnf-command(config-manager)' -y && \
         libxslt \
         make \
         ninja-build \
-        patch \
         perl \
-        perl-App-cpanminus \
         pkgconfig \
         python3 \
         python3-devel \
@@ -49,9 +45,7 @@ RUN pip3 install \
          meson==0.54.0
 
 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"
diff --git a/ci/containers/libvirt-centos-stream.Dockerfile b/ci/containers/libvirt-centos-stream.Dockerfile
index 7932149..5579f90 100644
--- a/ci/containers/libvirt-centos-stream.Dockerfile
+++ b/ci/containers/libvirt-centos-stream.Dockerfile
@@ -7,27 +7,18 @@ RUN dnf install -y centos-release-stream && \
     dnf install -y epel-release && \
     dnf update -y && \
     dnf install -y \
-        bash \
-        bash-completion \
         ca-certificates \
         ccache \
         gcc \
-        gettext \
         git \
-        glibc-devel \
         glibc-langpack-en \
         libvirt-devel \
-        patch \
-        perl \
-        perl-App-cpanminus \
         pkgconfig \
         python3 \
         python3-devel \
         python3-lxml \
         python3-nose \
-        python3-pip \
         python3-setuptools \
-        python3-wheel \
         rpm-build && \
     dnf autoremove -y && \
     dnf clean all -y && \
@@ -36,9 +27,5 @@ RUN dnf install -y centos-release-stream && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
 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"
diff --git a/ci/containers/libvirt-debian-10.Dockerfile b/ci/containers/libvirt-debian-10.Dockerfile
index a66144b..4ad857d 100644
--- a/ci/containers/libvirt-debian-10.Dockerfile
+++ b/ci/containers/libvirt-debian-10.Dockerfile
@@ -4,27 +4,18 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
     apt-get dist-upgrade -y && \
     apt-get install --no-install-recommends -y \
-            bash \
-            bash-completion \
             ca-certificates \
             ccache \
-            cpanminus \
             gcc \
-            gettext \
             git \
-            libc6-dev \
             libvirt-dev \
             locales \
-            patch \
-            perl \
             pkgconf \
             python3 \
             python3-dev \
             python3-lxml \
             python3-nose \
-            python3-pip \
-            python3-setuptools \
-            python3-wheel && \
+            python3-setuptools && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
@@ -34,9 +25,5 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
 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"
diff --git a/ci/containers/libvirt-debian-sid.Dockerfile b/ci/containers/libvirt-debian-sid.Dockerfile
index 6b7f325..a261e33 100644
--- a/ci/containers/libvirt-debian-sid.Dockerfile
+++ b/ci/containers/libvirt-debian-sid.Dockerfile
@@ -4,27 +4,18 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
     apt-get dist-upgrade -y && \
     apt-get install --no-install-recommends -y \
-            bash \
-            bash-completion \
             ca-certificates \
             ccache \
-            cpanminus \
             gcc \
-            gettext \
             git \
-            libc6-dev \
             libvirt-dev \
             locales \
-            patch \
-            perl \
             pkgconf \
             python3 \
             python3-dev \
             python3-lxml \
             python3-nose \
-            python3-pip \
-            python3-setuptools \
-            python3-wheel && \
+            python3-setuptools && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
@@ -34,9 +25,5 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
 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"
diff --git a/ci/containers/libvirt-fedora-32.Dockerfile b/ci/containers/libvirt-fedora-32.Dockerfile
index 63d327d..4bf5e0a 100644
--- a/ci/containers/libvirt-fedora-32.Dockerfile
+++ b/ci/containers/libvirt-fedora-32.Dockerfile
@@ -2,27 +2,18 @@ FROM registry.fedoraproject.org/fedora:32
 
 RUN dnf update -y && \
     dnf install -y \
-        bash \
-        bash-completion \
         ca-certificates \
         ccache \
         gcc \
-        gettext \
         git \
-        glibc-devel \
         glibc-langpack-en \
         libvirt-devel \
-        patch \
-        perl \
-        perl-App-cpanminus \
         pkgconfig \
         python3 \
         python3-devel \
         python3-lxml \
         python3-nose \
-        python3-pip \
         python3-setuptools \
-        python3-wheel \
         rpm-build && \
     dnf autoremove -y && \
     dnf clean all -y && \
@@ -31,9 +22,5 @@ RUN dnf update -y && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
 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"
diff --git a/ci/containers/libvirt-fedora-33.Dockerfile b/ci/containers/libvirt-fedora-33.Dockerfile
index 321e868..fe6e4b1 100644
--- a/ci/containers/libvirt-fedora-33.Dockerfile
+++ b/ci/containers/libvirt-fedora-33.Dockerfile
@@ -2,27 +2,18 @@ FROM registry.fedoraproject.org/fedora:33
 
 RUN dnf update -y && \
     dnf install -y \
-        bash \
-        bash-completion \
         ca-certificates \
         ccache \
         gcc \
-        gettext \
         git \
-        glibc-devel \
         glibc-langpack-en \
         libvirt-devel \
-        patch \
-        perl \
-        perl-App-cpanminus \
         pkgconfig \
         python3 \
         python3-devel \
         python3-lxml \
         python3-nose \
-        python3-pip \
         python3-setuptools \
-        python3-wheel \
         rpm-build && \
     dnf autoremove -y && \
     dnf clean all -y && \
@@ -31,9 +22,5 @@ RUN dnf update -y && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
 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"
diff --git a/ci/containers/libvirt-fedora-rawhide.Dockerfile b/ci/containers/libvirt-fedora-rawhide.Dockerfile
index 955e0f1..66deb87 100644
--- a/ci/containers/libvirt-fedora-rawhide.Dockerfile
+++ b/ci/containers/libvirt-fedora-rawhide.Dockerfile
@@ -3,27 +3,18 @@ FROM registry.fedoraproject.org/fedora:rawhide
 RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
     dnf update -y && \
     dnf install -y \
-        bash \
-        bash-completion \
         ca-certificates \
         ccache \
         gcc \
-        gettext \
         git \
-        glibc-devel \
         glibc-langpack-en \
         libvirt-devel \
-        patch \
-        perl \
-        perl-App-cpanminus \
         pkgconfig \
         python3 \
         python3-devel \
         python3-lxml \
         python3-nose \
-        python3-pip \
         python3-setuptools \
-        python3-wheel \
         rpm-build && \
     dnf autoremove -y && \
     dnf clean all -y && \
@@ -32,9 +23,5 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
 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"
diff --git a/ci/containers/libvirt-opensuse-151.Dockerfile b/ci/containers/libvirt-opensuse-151.Dockerfile
index fb5d652..ff52c92 100644
--- a/ci/containers/libvirt-opensuse-151.Dockerfile
+++ b/ci/containers/libvirt-opensuse-151.Dockerfile
@@ -2,27 +2,18 @@ FROM registry.opensuse.org/opensuse/leap:15.1
 
 RUN zypper update -y && \
     zypper install -y \
-           bash \
-           bash-completion \
            ca-certificates \
            ccache \
            gcc \
-           gettext \
            git \
-           glibc-devel \
            glibc-locale \
            libvirt-devel \
-           patch \
-           perl \
-           perl-App-cpanminus \
            pkgconfig \
            python3 \
            python3-devel \
            python3-lxml \
            python3-nose \
-           python3-pip \
            python3-setuptools \
-           python3-wheel \
            rpm-build && \
     zypper clean --all && \
     mkdir -p /usr/libexec/ccache-wrappers && \
@@ -30,9 +21,5 @@ RUN zypper update -y && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
 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"
diff --git a/ci/containers/libvirt-ubuntu-1804.Dockerfile b/ci/containers/libvirt-ubuntu-1804.Dockerfile
index 1a39f3e..ff19cdb 100644
--- a/ci/containers/libvirt-ubuntu-1804.Dockerfile
+++ b/ci/containers/libvirt-ubuntu-1804.Dockerfile
@@ -4,27 +4,18 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
     apt-get dist-upgrade -y && \
     apt-get install --no-install-recommends -y \
-            bash \
-            bash-completion \
             ca-certificates \
             ccache \
-            cpanminus \
             gcc \
-            gettext \
             git \
-            libc6-dev \
             libvirt-dev \
             locales \
-            patch \
-            perl \
             pkgconf \
             python3 \
             python3-dev \
             python3-lxml \
             python3-nose \
-            python3-pip \
-            python3-setuptools \
-            python3-wheel && \
+            python3-setuptools && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
@@ -34,9 +25,5 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
 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"
diff --git a/ci/containers/libvirt-ubuntu-2004.Dockerfile b/ci/containers/libvirt-ubuntu-2004.Dockerfile
index 124bf77..4be1a01 100644
--- a/ci/containers/libvirt-ubuntu-2004.Dockerfile
+++ b/ci/containers/libvirt-ubuntu-2004.Dockerfile
@@ -4,27 +4,18 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
     apt-get dist-upgrade -y && \
     apt-get install --no-install-recommends -y \
-            bash \
-            bash-completion \
             ca-certificates \
             ccache \
-            cpanminus \
             gcc \
-            gettext \
             git \
-            libc6-dev \
             libvirt-dev \
             locales \
-            patch \
-            perl \
             pkgconf \
             python3 \
             python3-dev \
             python3-lxml \
             python3-nose \
-            python3-pip \
-            python3-setuptools \
-            python3-wheel && \
+            python3-setuptools && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
@@ -34,9 +25,5 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
 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"