From bf29e894c8304fdf10f3d5d0825c9d00955e79fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Mon, 23 Nov 2020 18:20:57 +0000 Subject: [PATCH] gitlab: refresh containers with lcitool for fully minimized base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel P. Berrangé --- ci/containers/centos-7.Dockerfile | 14 -------------- ci/containers/centos-8.Dockerfile | 5 ----- ci/containers/centos-stream.Dockerfile | 5 ----- ci/containers/debian-10.Dockerfile | 16 +--------------- ci/containers/debian-sid.Dockerfile | 16 +--------------- ci/containers/fedora-32.Dockerfile | 14 -------------- ci/containers/fedora-33.Dockerfile | 16 +--------------- .../fedora-rawhide-cross-mingw32.Dockerfile | 9 +-------- .../fedora-rawhide-cross-mingw64.Dockerfile | 9 +-------- ci/containers/fedora-rawhide.Dockerfile | 14 -------------- ci/containers/opensuse-151.Dockerfile | 14 -------------- ci/containers/ubuntu-1804.Dockerfile | 16 +--------------- ci/containers/ubuntu-2004.Dockerfile | 16 +--------------- 13 files changed, 7 insertions(+), 157 deletions(-) diff --git a/ci/containers/centos-7.Dockerfile b/ci/containers/centos-7.Dockerfile index 83ccd9e..70e91a5 100644 --- a/ci/containers/centos-7.Dockerfile +++ b/ci/containers/centos-7.Dockerfile @@ -35,17 +35,14 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\ yum install -y \ autoconf \ automake \ - bash \ bash-completion \ ca-certificates \ ccache \ gcc \ - gettext \ gettext-devel \ git \ glib2-devel \ glibc-common \ - glibc-devel \ gtk-vnc2-devel \ gtk3-devel \ icoutils \ @@ -56,14 +53,7 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\ libxml2 \ libxml2-devel \ make \ - patch \ - perl \ - perl-App-cpanminus \ pkgconfig \ - python3 \ - python3-pip \ - python3-setuptools \ - python3-wheel \ rest-devel \ rpm-build \ spice-gtk3-devel && \ @@ -74,9 +64,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/centos-8.Dockerfile b/ci/containers/centos-8.Dockerfile index 2aff250..65b39b6 100644 --- a/ci/containers/centos-8.Dockerfile +++ b/ci/containers/centos-8.Dockerfile @@ -8,7 +8,6 @@ RUN dnf install 'dnf-command(config-manager)' -y && \ dnf install -y \ autoconf \ automake \ - bash \ bash-completion \ ca-certificates \ ccache \ @@ -36,9 +35,7 @@ RUN dnf install 'dnf-command(config-manager)' -y && \ libxslt \ make \ ninja-build \ - patch \ perl \ - perl-App-cpanminus \ pkgconfig \ pulseaudio-libs-devel \ python3 \ @@ -60,9 +57,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/centos-stream.Dockerfile b/ci/containers/centos-stream.Dockerfile index 37a4f50..720bd05 100644 --- a/ci/containers/centos-stream.Dockerfile +++ b/ci/containers/centos-stream.Dockerfile @@ -9,7 +9,6 @@ RUN dnf install -y centos-release-stream && \ dnf install -y \ autoconf \ automake \ - bash \ bash-completion \ ca-certificates \ ccache \ @@ -37,9 +36,7 @@ RUN dnf install -y centos-release-stream && \ libxslt \ make \ ninja-build \ - patch \ perl \ - perl-App-cpanminus \ pkgconfig \ pulseaudio-libs-devel \ python3 \ @@ -61,9 +58,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/debian-10.Dockerfile b/ci/containers/debian-10.Dockerfile index d583bd9..c1fca2b 100644 --- a/ci/containers/debian-10.Dockerfile +++ b/ci/containers/debian-10.Dockerfile @@ -7,16 +7,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ autoconf \ automake \ autopoint \ - bash \ bash-completion \ ca-certificates \ ccache \ - cpanminus \ gcc \ - gettext \ git \ icoutils \ - libc6-dev \ libglib2.0-dev \ libgovirt-dev \ libgtk-3-dev \ @@ -31,13 +27,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxml2-utils \ locales \ make \ - patch \ - perl \ - pkgconf \ - python3 \ - python3-pip \ - python3-setuptools \ - python3-wheel && \ + pkgconf && \ apt-get autoremove -y && \ apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ @@ -47,9 +37,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/debian-sid.Dockerfile b/ci/containers/debian-sid.Dockerfile index c45b42f..f2fd8bd 100644 --- a/ci/containers/debian-sid.Dockerfile +++ b/ci/containers/debian-sid.Dockerfile @@ -7,16 +7,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ autoconf \ automake \ autopoint \ - bash \ bash-completion \ ca-certificates \ ccache \ - cpanminus \ gcc \ - gettext \ git \ icoutils \ - libc6-dev \ libglib2.0-dev \ libgovirt-dev \ libgtk-3-dev \ @@ -31,13 +27,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxml2-utils \ locales \ make \ - patch \ - perl \ - pkgconf \ - python3 \ - python3-pip \ - python3-setuptools \ - python3-wheel && \ + pkgconf && \ apt-get autoremove -y && \ apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ @@ -47,9 +37,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/fedora-32.Dockerfile b/ci/containers/fedora-32.Dockerfile index 41dbae8..85e1987 100644 --- a/ci/containers/fedora-32.Dockerfile +++ b/ci/containers/fedora-32.Dockerfile @@ -4,16 +4,13 @@ RUN dnf update -y && \ dnf install -y \ autoconf \ automake \ - bash \ bash-completion \ ca-certificates \ ccache \ gcc \ - gettext \ gettext-devel \ git \ glib2-devel \ - glibc-devel \ glibc-langpack-en \ gtk-vnc2-devel \ gtk3-devel \ @@ -25,14 +22,7 @@ RUN dnf update -y && \ libxml2 \ libxml2-devel \ make \ - patch \ - perl \ - perl-App-cpanminus \ pkgconfig \ - python3 \ - python3-pip \ - python3-setuptools \ - python3-wheel \ rest-devel \ rpm-build \ spice-gtk3-devel && \ @@ -43,9 +33,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/fedora-33.Dockerfile b/ci/containers/fedora-33.Dockerfile index 52831bf..a183c3b 100644 --- a/ci/containers/fedora-33.Dockerfile +++ b/ci/containers/fedora-33.Dockerfile @@ -1,19 +1,16 @@ -FROM fedora:33 +FROM registry.fedoraproject.org/fedora:33 RUN dnf update -y && \ dnf install -y \ autoconf \ automake \ - bash \ bash-completion \ ca-certificates \ ccache \ gcc \ - gettext \ gettext-devel \ git \ glib2-devel \ - glibc-devel \ glibc-langpack-en \ gtk-vnc2-devel \ gtk3-devel \ @@ -25,14 +22,7 @@ RUN dnf update -y && \ libxml2 \ libxml2-devel \ make \ - patch \ - perl \ - perl-App-cpanminus \ pkgconfig \ - python3 \ - python3-pip \ - python3-setuptools \ - python3-wheel \ rest-devel \ rpm-build \ spice-gtk3-devel && \ @@ -43,9 +33,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/fedora-rawhide-cross-mingw32.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile index d725cfc..00502cc 100644 --- a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile @@ -6,12 +6,12 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ augeas \ autoconf \ automake \ - bash \ bash-completion \ ca-certificates \ ccache \ clang \ cppi \ + diffutils \ dnsmasq \ dwarves \ ebtables \ @@ -38,16 +38,11 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ ninja-build \ numad \ parted \ - patch \ perl \ - perl-App-cpanminus \ polkit \ python3 \ python3-docutils \ python3-flake8 \ - python3-pip \ - python3-setuptools \ - python3-wheel \ qemu-img \ radvd \ rpcgen \ @@ -87,11 +82,9 @@ RUN dnf install -y \ dnf clean all -y 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" ENV ABI "i686-w64-mingw32" diff --git a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile index e99d309..07cbfcf 100644 --- a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile @@ -6,12 +6,12 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ augeas \ autoconf \ automake \ - bash \ bash-completion \ ca-certificates \ ccache \ clang \ cppi \ + diffutils \ dnsmasq \ dwarves \ ebtables \ @@ -38,16 +38,11 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ ninja-build \ numad \ parted \ - patch \ perl \ - perl-App-cpanminus \ polkit \ python3 \ python3-docutils \ python3-flake8 \ - python3-pip \ - python3-setuptools \ - python3-wheel \ qemu-img \ radvd \ rpcgen \ @@ -87,11 +82,9 @@ RUN dnf install -y \ dnf clean all -y 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" ENV ABI "x86_64-w64-mingw32" diff --git a/ci/containers/fedora-rawhide.Dockerfile b/ci/containers/fedora-rawhide.Dockerfile index fe7ab03..89339f9 100644 --- a/ci/containers/fedora-rawhide.Dockerfile +++ b/ci/containers/fedora-rawhide.Dockerfile @@ -5,16 +5,13 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ dnf install -y \ autoconf \ automake \ - bash \ bash-completion \ ca-certificates \ ccache \ gcc \ - gettext \ gettext-devel \ git \ glib2-devel \ - glibc-devel \ glibc-langpack-en \ gtk-vnc2-devel \ gtk3-devel \ @@ -26,14 +23,7 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ libxml2 \ libxml2-devel \ make \ - patch \ - perl \ - perl-App-cpanminus \ pkgconfig \ - python3 \ - python3-pip \ - python3-setuptools \ - python3-wheel \ rest-devel \ rpm-build \ spice-gtk3-devel && \ @@ -44,9 +34,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/opensuse-151.Dockerfile b/ci/containers/opensuse-151.Dockerfile index d5da708..904814c 100644 --- a/ci/containers/opensuse-151.Dockerfile +++ b/ci/containers/opensuse-151.Dockerfile @@ -4,16 +4,13 @@ RUN zypper update -y && \ zypper install -y \ autoconf \ automake \ - bash \ bash-completion \ ca-certificates \ ccache \ gcc \ - gettext \ gettext-devel \ git \ glib2-devel \ - glibc-devel \ glibc-locale \ gtk-vnc2-devel \ gtk3-devel \ @@ -26,14 +23,7 @@ RUN zypper update -y && \ libxml2 \ libxml2-devel \ make \ - patch \ - perl \ - perl-App-cpanminus \ pkgconfig \ - python3 \ - python3-pip \ - python3-setuptools \ - python3-wheel \ rpm-build \ spice-gtk-devel && \ zypper clean --all && \ @@ -42,9 +32,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/ubuntu-1804.Dockerfile b/ci/containers/ubuntu-1804.Dockerfile index fc2d7fa..37754d2 100644 --- a/ci/containers/ubuntu-1804.Dockerfile +++ b/ci/containers/ubuntu-1804.Dockerfile @@ -7,16 +7,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ autoconf \ automake \ autopoint \ - bash \ bash-completion \ ca-certificates \ ccache \ - cpanminus \ gcc \ - gettext \ git \ icoutils \ - libc6-dev \ libglib2.0-dev \ libgtk-3-dev \ libgtk-vnc-2.0-dev \ @@ -30,13 +26,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxml2-utils \ locales \ make \ - patch \ - perl \ - pkgconf \ - python3 \ - python3-pip \ - python3-setuptools \ - python3-wheel && \ + pkgconf && \ apt-get autoremove -y && \ apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ @@ -46,9 +36,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/ubuntu-2004.Dockerfile b/ci/containers/ubuntu-2004.Dockerfile index b8c983c..a6c113c 100644 --- a/ci/containers/ubuntu-2004.Dockerfile +++ b/ci/containers/ubuntu-2004.Dockerfile @@ -7,16 +7,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ autoconf \ automake \ autopoint \ - bash \ bash-completion \ ca-certificates \ ccache \ - cpanminus \ gcc \ - gettext \ git \ icoutils \ - libc6-dev \ libglib2.0-dev \ libgtk-3-dev \ libgtk-vnc-2.0-dev \ @@ -30,13 +26,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxml2-utils \ locales \ make \ - patch \ - perl \ - pkgconf \ - python3 \ - python3-pip \ - python3-setuptools \ - python3-wheel && \ + pkgconf && \ apt-get autoremove -y && \ apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ @@ -46,9 +36,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"