Contains changes utilizing "nosync" and "eatmydata" for speedup as well as fixes for CentOS-8 repoid regression. ci-commit: b098ec6631a85880f818f2dd25c437d509e53680 Signed-off-by: Erik Skultety <eskultet(a)redhat.com&gt; --- Pipeline on my private fork: https://gitlab.com/eskultety/libvirt/-/pipelines/229588144 If you want to ACK this patch, feel free to push this for me too as I won't respond much during my PTO and I'd like the pipeline to become green again. ci/containers/ci-centos-7.Dockerfile | 13 ++++++-- ci/containers/ci-centos-8.Dockerfile | 14 +++++--- ci/containers/ci-centos-stream.Dockerfile | 12 +++++-- .../ci-debian-10-cross-aarch64.Dockerfile | 30 ++++++++++------- .../ci-debian-10-cross-armv6l.Dockerfile | 30 ++++++++++------- .../ci-debian-10-cross-armv7l.Dockerfile | 30 ++++++++++------- .../ci-debian-10-cross-i686.Dockerfile | 30 ++++++++++------- .../ci-debian-10-cross-mips.Dockerfile | 30 ++++++++++------- .../ci-debian-10-cross-mips64el.Dockerfile | 30 ++++++++++------- .../ci-debian-10-cross-mipsel.Dockerfile | 30 ++++++++++------- .../ci-debian-10-cross-ppc64le.Dockerfile | 30 ++++++++++------- .../ci-debian-10-cross-s390x.Dockerfile | 30 ++++++++++------- ci/containers/ci-debian-10.Dockerfile | 17 +++++++--- .../ci-debian-sid-cross-aarch64.Dockerfile | 30 ++++++++++------- .../ci-debian-sid-cross-armv6l.Dockerfile | 30 ++++++++++------- .../ci-debian-sid-cross-armv7l.Dockerfile | 30 ++++++++++------- .../ci-debian-sid-cross-i686.Dockerfile | 30 ++++++++++------- .../ci-debian-sid-cross-mips64el.Dockerfile | 30 ++++++++++------- .../ci-debian-sid-cross-mipsel.Dockerfile | 30 ++++++++++------- .../ci-debian-sid-cross-ppc64le.Dockerfile | 30 ++++++++++------- .../ci-debian-sid-cross-s390x.Dockerfile | 30 ++++++++++------- ci/containers/ci-debian-sid.Dockerfile | 17 +++++++--- ci/containers/ci-fedora-32.Dockerfile | 24 +++++++++++--- ci/containers/ci-fedora-33.Dockerfile | 24 +++++++++++--- ...ci-fedora-rawhide-cross-mingw32.Dockerfile | 33 +++++++++++++------ ...ci-fedora-rawhide-cross-mingw64.Dockerfile | 33 +++++++++++++------ ci/containers/ci-fedora-rawhide.Dockerfile | 26 ++++++++++++--- ci/containers/ci-opensuse-151.Dockerfile | 6 ++++ ci/containers/ci-ubuntu-1804.Dockerfile | 15 ++++++--- ci/containers/ci-ubuntu-2004.Dockerfile | 15 ++++++--- 30 files changed, 495 insertions(+), 264 deletions(-) diff --git a/ci/containers/ci-centos-7.Dockerfile b/ci/containers/ci-centos-7.Dockerfile index d94f335c9d..39ec95ca55 100644 --- a/ci/containers/ci-centos-7.Dockerfile +++ b/ci/containers/ci-centos-7.Dockerfile @@ -1,6 +1,13 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile centos-7 libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25... FROM registry.centos.org/centos:7 -RUN echo -e '[openvz]\n\ +RUN yum update -y && \ + echo 'skip_missing_names_on_install=0' >> /etc/yum.conf && \ + echo -e '[openvz]\n\ name=OpenVZ addons\n\ baseurl=https://download.openvz.org/virtuozzo/releases/openvz-7.0.11-235/... enabled=1\n\ @@ -31,7 +38,7 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\ -----END PGP PUBLIC KEY BLOCK-----' > /etc/pki/rpm-gpg/RPM-GPG-KEY-OpenVZ && \ rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-OpenVZ && \ yum install -y epel-release && \ - yum update -y && \ + yum install -y centos-release-xen-48 && \ yum install -y \ audit-libs-devel \ augeas \ @@ -105,10 +112,12 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\ scrub \ systemtap-sdt-devel \ wireshark-devel \ + xen-devel \ xfsprogs-devel \ yajl-devel && \ yum autoremove -y && \ yum clean all -y && \ + rpm -qa | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) diff --git a/ci/containers/ci-centos-8.Dockerfile b/ci/containers/ci-centos-8.Dockerfile index 568e23af76..8f240d2a33 100644 --- a/ci/containers/ci-centos-8.Dockerfile +++ b/ci/containers/ci-centos-8.Dockerfile @@ -1,10 +1,15 @@ -FROM registry.centos.org/centos:8 +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile centos-8 libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25... +FROM docker.io/library/centos:8 -RUN dnf install 'dnf-command(config-manager)' -y && \ - dnf config-manager --set-enabled -y PowerTools && \ +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 update -y && \ dnf install -y \ audit-libs-devel \ augeas \ @@ -84,6 +89,7 @@ RUN dnf install 'dnf-command(config-manager)' -y && \ yajl-devel && \ 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/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) diff --git a/ci/containers/ci-centos-stream.Dockerfile b/ci/containers/ci-centos-stream.Dockerfile index f1ecab837a..141b378438 100644 --- a/ci/containers/ci-centos-stream.Dockerfile +++ b/ci/containers/ci-centos-stream.Dockerfile @@ -1,11 +1,16 @@ -FROM registry.centos.org/centos:8 +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile centos-stream libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25... +FROM docker.io/library/centos:8 -RUN dnf install -y centos-release-stream && \ +RUN dnf update -y && \ + dnf install -y centos-release-stream && \ dnf install 'dnf-command(config-manager)' -y && \ dnf config-manager --set-enabled -y Stream-PowerTools && \ dnf install -y centos-release-advanced-virtualization && \ dnf install -y epel-release && \ - dnf update -y && \ dnf install -y \ audit-libs-devel \ augeas \ @@ -85,6 +90,7 @@ RUN dnf install -y centos-release-stream && \ yajl-devel && \ 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/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) diff --git a/ci/containers/ci-debian-10-cross-aarch64.Dockerfile b/ci/containers/ci-debian-10-cross-aarch64.Dockerfile index 1c755908f2..a8ec0ad135 100644 --- a/ci/containers/ci-debian-10-cross-aarch64.Dockerfile +++ b/ci/containers/ci-debian-10-cross-aarch64.Dockerfile @@ -1,9 +1,15 @@ -FROM docker.io/library/debian:10 +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --cross aarch64 debian-10 libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25... +FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ bash-completion \ @@ -43,20 +49,21 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ scrub \ xsltproc \ zfs-fuse && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture arm64 && \ - apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y dpkg-dev && \ - apt-get install --no-install-recommends -y \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-aarch64-linux-gnu \ libacl1-dev:arm64 \ libapparmor-dev:arm64 \ @@ -93,8 +100,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxml2-dev:arm64 \ libyajl-dev:arm64 \ xfslibs-dev:arm64 && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ echo "[binaries]\n\ c = '/usr/bin/aarch64-linux-gnu-gcc'\n\ @@ -118,5 +125,4 @@ ENV PYTHON "/usr/bin/python3" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV ABI "aarch64-linux-gnu" -ENV CONFIGURE_OPTS "--host=aarch64-linux-gnu" ENV MESON_OPTS "--cross-file=aarch64-linux-gnu" diff --git a/ci/containers/ci-debian-10-cross-armv6l.Dockerfile b/ci/containers/ci-debian-10-cross-armv6l.Dockerfile index 327b4f7e7e..cfb1a61585 100644 --- a/ci/containers/ci-debian-10-cross-armv6l.Dockerfile +++ b/ci/containers/ci-debian-10-cross-armv6l.Dockerfile @@ -1,9 +1,15 @@ -FROM docker.io/library/debian:10 +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --cross armv6l debian-10 libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25... +FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ bash-completion \ @@ -43,20 +49,21 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ scrub \ xsltproc \ zfs-fuse && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture armel && \ - apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y dpkg-dev && \ - apt-get install --no-install-recommends -y \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-arm-linux-gnueabi \ libacl1-dev:armel \ libapparmor-dev:armel \ @@ -92,8 +99,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxml2-dev:armel \ libyajl-dev:armel \ xfslibs-dev:armel && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ echo "[binaries]\n\ c = '/usr/bin/arm-linux-gnueabi-gcc'\n\ @@ -117,5 +124,4 @@ ENV PYTHON "/usr/bin/python3" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV ABI "arm-linux-gnueabi" -ENV CONFIGURE_OPTS "--host=arm-linux-gnueabi" ENV MESON_OPTS "--cross-file=arm-linux-gnueabi" diff --git a/ci/containers/ci-debian-10-cross-armv7l.Dockerfile b/ci/containers/ci-debian-10-cross-armv7l.Dockerfile index d73de0d4d2..06e2472498 100644 --- a/ci/containers/ci-debian-10-cross-armv7l.Dockerfile +++ b/ci/containers/ci-debian-10-cross-armv7l.Dockerfile @@ -1,9 +1,15 @@ -FROM docker.io/library/debian:10 +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --cross armv7l debian-10 libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25... +FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ bash-completion \ @@ -43,20 +49,21 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ scrub \ xsltproc \ zfs-fuse && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture armhf && \ - apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y dpkg-dev && \ - apt-get install --no-install-recommends -y \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-arm-linux-gnueabihf \ libacl1-dev:armhf \ libapparmor-dev:armhf \ @@ -93,8 +100,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxml2-dev:armhf \ libyajl-dev:armhf \ xfslibs-dev:armhf && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ echo "[binaries]\n\ c = '/usr/bin/arm-linux-gnueabihf-gcc'\n\ @@ -118,5 +125,4 @@ ENV PYTHON "/usr/bin/python3" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV ABI "arm-linux-gnueabihf" -ENV CONFIGURE_OPTS "--host=arm-linux-gnueabihf" ENV MESON_OPTS "--cross-file=arm-linux-gnueabihf" diff --git a/ci/containers/ci-debian-10-cross-i686.Dockerfile b/ci/containers/ci-debian-10-cross-i686.Dockerfile index 41922b7582..27dbc1ba97 100644 --- a/ci/containers/ci-debian-10-cross-i686.Dockerfile +++ b/ci/containers/ci-debian-10-cross-i686.Dockerfile @@ -1,9 +1,15 @@ -FROM docker.io/library/debian:10 +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --cross i686 debian-10 libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25... +FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ bash-completion \ @@ -43,20 +49,21 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ scrub \ xsltproc \ zfs-fuse && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture i386 && \ - apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y dpkg-dev && \ - apt-get install --no-install-recommends -y \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-i686-linux-gnu \ libacl1-dev:i386 \ libapparmor-dev:i386 \ @@ -92,8 +99,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxml2-dev:i386 \ libyajl-dev:i386 \ xfslibs-dev:i386 && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ echo "[binaries]\n\ c = '/usr/bin/i686-linux-gnu-gcc'\n\ @@ -117,5 +124,4 @@ ENV PYTHON "/usr/bin/python3" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV ABI "i686-linux-gnu" -ENV CONFIGURE_OPTS "--host=i686-linux-gnu" ENV MESON_OPTS "--cross-file=i686-linux-gnu" diff --git a/ci/containers/ci-debian-10-cross-mips.Dockerfile b/ci/containers/ci-debian-10-cross-mips.Dockerfile index 369a8a7e42..596a1f9d6b 100644 --- a/ci/containers/ci-debian-10-cross-mips.Dockerfile +++ b/ci/containers/ci-debian-10-cross-mips.Dockerfile @@ -1,9 +1,15 @@ -FROM docker.io/library/debian:10 +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --cross mips debian-10 libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25... +FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ bash-completion \ @@ -43,20 +49,21 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ scrub \ xsltproc \ zfs-fuse && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips-linux-gnu-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips-linux-gnu-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mips && \ - apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y dpkg-dev && \ - apt-get install --no-install-recommends -y \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-mips-linux-gnu \ libacl1-dev:mips \ libapparmor-dev:mips \ @@ -92,8 +99,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxml2-dev:mips \ libyajl-dev:mips \ xfslibs-dev:mips && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ echo "[binaries]\n\ c = '/usr/bin/mips-linux-gnu-gcc'\n\ @@ -117,5 +124,4 @@ ENV PYTHON "/usr/bin/python3" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV ABI "mips-linux-gnu" -ENV CONFIGURE_OPTS "--host=mips-linux-gnu" ENV MESON_OPTS "--cross-file=mips-linux-gnu" diff --git a/ci/containers/ci-debian-10-cross-mips64el.Dockerfile b/ci/containers/ci-debian-10-cross-mips64el.Dockerfile index c8f6bd818f..b71619811f 100644 --- a/ci/containers/ci-debian-10-cross-mips64el.Dockerfile +++ b/ci/containers/ci-debian-10-cross-mips64el.Dockerfile @@ -1,9 +1,15 @@ -FROM docker.io/library/debian:10 +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --cross mips64el debian-10 libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25... +FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ bash-completion \ @@ -43,20 +49,21 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ scrub \ xsltproc \ zfs-fuse && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mips64el && \ - apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y dpkg-dev && \ - apt-get install --no-install-recommends -y \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-mips64el-linux-gnuabi64 \ libacl1-dev:mips64el \ libapparmor-dev:mips64el \ @@ -92,8 +99,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxml2-dev:mips64el \ libyajl-dev:mips64el \ xfslibs-dev:mips64el && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ echo "[binaries]\n\ c = '/usr/bin/mips64el-linux-gnuabi64-gcc'\n\ @@ -117,5 +124,4 @@ ENV PYTHON "/usr/bin/python3" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV ABI "mips64el-linux-gnuabi64" -ENV CONFIGURE_OPTS "--host=mips64el-linux-gnuabi64" ENV MESON_OPTS "--cross-file=mips64el-linux-gnuabi64" diff --git a/ci/containers/ci-debian-10-cross-mipsel.Dockerfile b/ci/containers/ci-debian-10-cross-mipsel.Dockerfile index 81de62b44b..b45112f3bc 100644 --- a/ci/containers/ci-debian-10-cross-mipsel.Dockerfile +++ b/ci/containers/ci-debian-10-cross-mipsel.Dockerfile @@ -1,9 +1,15 @@ -FROM docker.io/library/debian:10 +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --cross mipsel debian-10 libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25... +FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ bash-completion \ @@ -43,20 +49,21 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ scrub \ xsltproc \ zfs-fuse && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mipsel && \ - apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y dpkg-dev && \ - apt-get install --no-install-recommends -y \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-mipsel-linux-gnu \ libacl1-dev:mipsel \ libapparmor-dev:mipsel \ @@ -92,8 +99,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxml2-dev:mipsel \ libyajl-dev:mipsel \ xfslibs-dev:mipsel && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ echo "[binaries]\n\ c = '/usr/bin/mipsel-linux-gnu-gcc'\n\ @@ -117,5 +124,4 @@ ENV PYTHON "/usr/bin/python3" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV ABI "mipsel-linux-gnu" -ENV CONFIGURE_OPTS "--host=mipsel-linux-gnu" ENV MESON_OPTS "--cross-file=mipsel-linux-gnu" diff --git a/ci/containers/ci-debian-10-cross-ppc64le.Dockerfile b/ci/containers/ci-debian-10-cross-ppc64le.Dockerfile index c4dcd63431..9b833fdd4d 100644 --- a/ci/containers/ci-debian-10-cross-ppc64le.Dockerfile +++ b/ci/containers/ci-debian-10-cross-ppc64le.Dockerfile @@ -1,9 +1,15 @@ -FROM docker.io/library/debian:10 +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --cross ppc64le debian-10 libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25... +FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ bash-completion \ @@ -43,20 +49,21 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ scrub \ xsltproc \ zfs-fuse && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture ppc64el && \ - apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y dpkg-dev && \ - apt-get install --no-install-recommends -y \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-powerpc64le-linux-gnu \ libacl1-dev:ppc64el \ libapparmor-dev:ppc64el \ @@ -92,8 +99,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxml2-dev:ppc64el \ libyajl-dev:ppc64el \ xfslibs-dev:ppc64el && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ echo "[binaries]\n\ c = '/usr/bin/powerpc64le-linux-gnu-gcc'\n\ @@ -117,5 +124,4 @@ ENV PYTHON "/usr/bin/python3" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV ABI "powerpc64le-linux-gnu" -ENV CONFIGURE_OPTS "--host=powerpc64le-linux-gnu" ENV MESON_OPTS "--cross-file=powerpc64le-linux-gnu" diff --git a/ci/containers/ci-debian-10-cross-s390x.Dockerfile b/ci/containers/ci-debian-10-cross-s390x.Dockerfile index 9a5f8edbe5..1a324e7e08 100644 --- a/ci/containers/ci-debian-10-cross-s390x.Dockerfile +++ b/ci/containers/ci-debian-10-cross-s390x.Dockerfile @@ -1,9 +1,15 @@ -FROM docker.io/library/debian:10 +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --cross s390x debian-10 libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25... +FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ bash-completion \ @@ -43,20 +49,21 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ scrub \ xsltproc \ zfs-fuse && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture s390x && \ - apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y dpkg-dev && \ - apt-get install --no-install-recommends -y \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-s390x-linux-gnu \ libacl1-dev:s390x \ libapparmor-dev:s390x \ @@ -92,8 +99,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxml2-dev:s390x \ libyajl-dev:s390x \ xfslibs-dev:s390x && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ echo "[binaries]\n\ c = '/usr/bin/s390x-linux-gnu-gcc'\n\ @@ -117,5 +124,4 @@ ENV PYTHON "/usr/bin/python3" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV ABI "s390x-linux-gnu" -ENV CONFIGURE_OPTS "--host=s390x-linux-gnu" ENV MESON_OPTS "--cross-file=s390x-linux-gnu" diff --git a/ci/containers/ci-debian-10.Dockerfile b/ci/containers/ci-debian-10.Dockerfile index 9858584b03..ac8a35e175 100644 --- a/ci/containers/ci-debian-10.Dockerfile +++ b/ci/containers/ci-debian-10.Dockerfile @@ -1,9 +1,15 @@ -FROM docker.io/library/debian:10 +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile debian-10 libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25... +FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ bash-completion \ @@ -81,10 +87,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ xfslibs-dev \ xsltproc \ zfs-fuse && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) diff --git a/ci/containers/ci-debian-sid-cross-aarch64.Dockerfile b/ci/containers/ci-debian-sid-cross-aarch64.Dockerfile index dff7cb620e..c46012b5af 100644 --- a/ci/containers/ci-debian-sid-cross-aarch64.Dockerfile +++ b/ci/containers/ci-debian-sid-cross-aarch64.Dockerfile @@ -1,9 +1,15 @@ -FROM docker.io/library/debian:sid +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --cross aarch64 debian-sid libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25... +FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ bash-completion \ @@ -41,20 +47,21 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ scrub \ xsltproc \ zfs-fuse && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture arm64 && \ - apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y dpkg-dev && \ - apt-get install --no-install-recommends -y \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-aarch64-linux-gnu \ libacl1-dev:arm64 \ libapparmor-dev:arm64 \ @@ -91,8 +98,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxml2-dev:arm64 \ libyajl-dev:arm64 \ xfslibs-dev:arm64 && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ echo "[binaries]\n\ c = '/usr/bin/aarch64-linux-gnu-gcc'\n\ @@ -113,5 +120,4 @@ ENV PYTHON "/usr/bin/python3" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV ABI "aarch64-linux-gnu" -ENV CONFIGURE_OPTS "--host=aarch64-linux-gnu" ENV MESON_OPTS "--cross-file=aarch64-linux-gnu" diff --git a/ci/containers/ci-debian-sid-cross-armv6l.Dockerfile b/ci/containers/ci-debian-sid-cross-armv6l.Dockerfile index f3a168be3b..f61bfc5009 100644 --- a/ci/containers/ci-debian-sid-cross-armv6l.Dockerfile +++ b/ci/containers/ci-debian-sid-cross-armv6l.Dockerfile @@ -1,9 +1,15 @@ -FROM docker.io/library/debian:sid +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --cross armv6l debian-sid libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25... +FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ bash-completion \ @@ -41,20 +47,21 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ scrub \ xsltproc \ zfs-fuse && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture armel && \ - apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y dpkg-dev && \ - apt-get install --no-install-recommends -y \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-arm-linux-gnueabi \ libacl1-dev:armel \ libapparmor-dev:armel \ @@ -90,8 +97,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxml2-dev:armel \ libyajl-dev:armel \ xfslibs-dev:armel && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ echo "[binaries]\n\ c = '/usr/bin/arm-linux-gnueabi-gcc'\n\ @@ -112,5 +119,4 @@ ENV PYTHON "/usr/bin/python3" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV ABI "arm-linux-gnueabi" -ENV CONFIGURE_OPTS "--host=arm-linux-gnueabi" ENV MESON_OPTS "--cross-file=arm-linux-gnueabi" diff --git a/ci/containers/ci-debian-sid-cross-armv7l.Dockerfile b/ci/containers/ci-debian-sid-cross-armv7l.Dockerfile index 88f1033ed5..89e62f1ab3 100644 --- a/ci/containers/ci-debian-sid-cross-armv7l.Dockerfile +++ b/ci/containers/ci-debian-sid-cross-armv7l.Dockerfile @@ -1,9 +1,15 @@ -FROM docker.io/library/debian:sid +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --cross armv7l debian-sid libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25... +FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ bash-completion \ @@ -41,20 +47,21 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ scrub \ xsltproc \ zfs-fuse && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture armhf && \ - apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y dpkg-dev && \ - apt-get install --no-install-recommends -y \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-arm-linux-gnueabihf \ libacl1-dev:armhf \ libapparmor-dev:armhf \ @@ -91,8 +98,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxml2-dev:armhf \ libyajl-dev:armhf \ xfslibs-dev:armhf && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ echo "[binaries]\n\ c = '/usr/bin/arm-linux-gnueabihf-gcc'\n\ @@ -113,5 +120,4 @@ ENV PYTHON "/usr/bin/python3" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV ABI "arm-linux-gnueabihf" -ENV CONFIGURE_OPTS "--host=arm-linux-gnueabihf" ENV MESON_OPTS "--cross-file=arm-linux-gnueabihf" diff --git a/ci/containers/ci-debian-sid-cross-i686.Dockerfile b/ci/containers/ci-debian-sid-cross-i686.Dockerfile index e34c8074d9..f3c3a75119 100644 --- a/ci/containers/ci-debian-sid-cross-i686.Dockerfile +++ b/ci/containers/ci-debian-sid-cross-i686.Dockerfile @@ -1,9 +1,15 @@ -FROM docker.io/library/debian:sid +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --cross i686 debian-sid libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25... +FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ bash-completion \ @@ -41,20 +47,21 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ scrub \ xsltproc \ zfs-fuse && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture i386 && \ - apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y dpkg-dev && \ - apt-get install --no-install-recommends -y \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-i686-linux-gnu \ libacl1-dev:i386 \ libapparmor-dev:i386 \ @@ -90,8 +97,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxml2-dev:i386 \ libyajl-dev:i386 \ xfslibs-dev:i386 && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ echo "[binaries]\n\ c = '/usr/bin/i686-linux-gnu-gcc'\n\ @@ -112,5 +119,4 @@ ENV PYTHON "/usr/bin/python3" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV ABI "i686-linux-gnu" -ENV CONFIGURE_OPTS "--host=i686-linux-gnu" ENV MESON_OPTS "--cross-file=i686-linux-gnu" diff --git a/ci/containers/ci-debian-sid-cross-mips64el.Dockerfile b/ci/containers/ci-debian-sid-cross-mips64el.Dockerfile index eaf1bf5641..95682c748c 100644 --- a/ci/containers/ci-debian-sid-cross-mips64el.Dockerfile +++ b/ci/containers/ci-debian-sid-cross-mips64el.Dockerfile @@ -1,9 +1,15 @@ -FROM docker.io/library/debian:sid +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --cross mips64el debian-sid libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25... +FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ bash-completion \ @@ -41,20 +47,21 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ scrub \ xsltproc \ zfs-fuse && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mips64el && \ - apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y dpkg-dev && \ - apt-get install --no-install-recommends -y \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-mips64el-linux-gnuabi64 \ libacl1-dev:mips64el \ libapparmor-dev:mips64el \ @@ -90,8 +97,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxml2-dev:mips64el \ libyajl-dev:mips64el \ xfslibs-dev:mips64el && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ echo "[binaries]\n\ c = '/usr/bin/mips64el-linux-gnuabi64-gcc'\n\ @@ -112,5 +119,4 @@ ENV PYTHON "/usr/bin/python3" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV ABI "mips64el-linux-gnuabi64" -ENV CONFIGURE_OPTS "--host=mips64el-linux-gnuabi64" ENV MESON_OPTS "--cross-file=mips64el-linux-gnuabi64" diff --git a/ci/containers/ci-debian-sid-cross-mipsel.Dockerfile b/ci/containers/ci-debian-sid-cross-mipsel.Dockerfile index 424f97315d..0ea3f0ac89 100644 --- a/ci/containers/ci-debian-sid-cross-mipsel.Dockerfile +++ b/ci/containers/ci-debian-sid-cross-mipsel.Dockerfile @@ -1,9 +1,15 @@ -FROM docker.io/library/debian:sid +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --cross mipsel debian-sid libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25... +FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ bash-completion \ @@ -41,20 +47,21 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ scrub \ xsltproc \ zfs-fuse && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mipsel && \ - apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y dpkg-dev && \ - apt-get install --no-install-recommends -y \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-mipsel-linux-gnu \ libacl1-dev:mipsel \ libapparmor-dev:mipsel \ @@ -90,8 +97,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxml2-dev:mipsel \ libyajl-dev:mipsel \ xfslibs-dev:mipsel && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ echo "[binaries]\n\ c = '/usr/bin/mipsel-linux-gnu-gcc'\n\ @@ -112,5 +119,4 @@ ENV PYTHON "/usr/bin/python3" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV ABI "mipsel-linux-gnu" -ENV CONFIGURE_OPTS "--host=mipsel-linux-gnu" ENV MESON_OPTS "--cross-file=mipsel-linux-gnu" diff --git a/ci/containers/ci-debian-sid-cross-ppc64le.Dockerfile b/ci/containers/ci-debian-sid-cross-ppc64le.Dockerfile index 311106e337..8dc93482b3 100644 --- a/ci/containers/ci-debian-sid-cross-ppc64le.Dockerfile +++ b/ci/containers/ci-debian-sid-cross-ppc64le.Dockerfile @@ -1,9 +1,15 @@ -FROM docker.io/library/debian:sid +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --cross ppc64le debian-sid libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25... +FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ bash-completion \ @@ -41,20 +47,21 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ scrub \ xsltproc \ zfs-fuse && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture ppc64el && \ - apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y dpkg-dev && \ - apt-get install --no-install-recommends -y \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-powerpc64le-linux-gnu \ libacl1-dev:ppc64el \ libapparmor-dev:ppc64el \ @@ -90,8 +97,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxml2-dev:ppc64el \ libyajl-dev:ppc64el \ xfslibs-dev:ppc64el && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ echo "[binaries]\n\ c = '/usr/bin/powerpc64le-linux-gnu-gcc'\n\ @@ -112,5 +119,4 @@ ENV PYTHON "/usr/bin/python3" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV ABI "powerpc64le-linux-gnu" -ENV CONFIGURE_OPTS "--host=powerpc64le-linux-gnu" ENV MESON_OPTS "--cross-file=powerpc64le-linux-gnu" diff --git a/ci/containers/ci-debian-sid-cross-s390x.Dockerfile b/ci/containers/ci-debian-sid-cross-s390x.Dockerfile index ee188c0a20..d99f55e896 100644 --- a/ci/containers/ci-debian-sid-cross-s390x.Dockerfile +++ b/ci/containers/ci-debian-sid-cross-s390x.Dockerfile @@ -1,9 +1,15 @@ -FROM docker.io/library/debian:sid +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --cross s390x debian-sid libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25... +FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ bash-completion \ @@ -41,20 +47,21 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ scrub \ xsltproc \ zfs-fuse && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture s390x && \ - apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y dpkg-dev && \ - apt-get install --no-install-recommends -y \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-s390x-linux-gnu \ libacl1-dev:s390x \ libapparmor-dev:s390x \ @@ -90,8 +97,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxml2-dev:s390x \ libyajl-dev:s390x \ xfslibs-dev:s390x && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ echo "[binaries]\n\ c = '/usr/bin/s390x-linux-gnu-gcc'\n\ @@ -112,5 +119,4 @@ ENV PYTHON "/usr/bin/python3" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV ABI "s390x-linux-gnu" -ENV CONFIGURE_OPTS "--host=s390x-linux-gnu" ENV MESON_OPTS "--cross-file=s390x-linux-gnu" diff --git a/ci/containers/ci-debian-sid.Dockerfile b/ci/containers/ci-debian-sid.Dockerfile index d914d5d6c2..e2bef48135 100644 --- a/ci/containers/ci-debian-sid.Dockerfile +++ b/ci/containers/ci-debian-sid.Dockerfile @@ -1,9 +1,15 @@ -FROM docker.io/library/debian:sid +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile debian-sid libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25... +FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ bash-completion \ @@ -79,10 +85,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ xfslibs-dev \ xsltproc \ zfs-fuse && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) diff --git a/ci/containers/ci-fedora-32.Dockerfile b/ci/containers/ci-fedora-32.Dockerfile index 8be1754ac5..94bc3e1f92 100644 --- a/ci/containers/ci-fedora-32.Dockerfile +++ b/ci/containers/ci-fedora-32.Dockerfile @@ -1,7 +1,22 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile fedora-32 libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25... FROM registry.fedoraproject.org/fedora:32 -RUN dnf update -y && \ - dnf install -y \ +RUN dnf install -y nosync && \ + echo -e '#!/bin/sh\n\ +if test -d /usr/lib64\n\ +then\n\ + export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\ +else\n\ + export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\ +fi\n\ +exec "$@"' > /usr/bin/nosync && \ + chmod +x /usr/bin/nosync && \ + nosync dnf update -y && \ + nosync dnf install -y \ audit-libs-devel \ augeas \ avahi-devel \ @@ -80,8 +95,9 @@ RUN dnf update -y && \ xfsprogs-devel \ yajl-devel \ zfs-fuse && \ - dnf autoremove -y && \ - dnf clean all -y && \ + nosync dnf autoremove -y && \ + nosync dnf clean all -y && \ + rpm -qa | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) diff --git a/ci/containers/ci-fedora-33.Dockerfile b/ci/containers/ci-fedora-33.Dockerfile index ef32628069..370996cd2f 100644 --- a/ci/containers/ci-fedora-33.Dockerfile +++ b/ci/containers/ci-fedora-33.Dockerfile @@ -1,7 +1,22 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile fedora-33 libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25... FROM registry.fedoraproject.org/fedora:33 -RUN dnf update -y && \ - dnf install -y \ +RUN dnf install -y nosync && \ + echo -e '#!/bin/sh\n\ +if test -d /usr/lib64\n\ +then\n\ + export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\ +else\n\ + export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\ +fi\n\ +exec "$@"' > /usr/bin/nosync && \ + chmod +x /usr/bin/nosync && \ + nosync dnf update -y && \ + nosync dnf install -y \ audit-libs-devel \ augeas \ avahi-devel \ @@ -80,8 +95,9 @@ RUN dnf update -y && \ xfsprogs-devel \ yajl-devel \ zfs-fuse && \ - dnf autoremove -y && \ - dnf clean all -y && \ + nosync dnf autoremove -y && \ + nosync dnf clean all -y && \ + rpm -qa | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) diff --git a/ci/containers/ci-fedora-rawhide-cross-mingw32.Dockerfile b/ci/containers/ci-fedora-rawhide-cross-mingw32.Dockerfile index 32527e8e56..1e8a51faab 100644 --- a/ci/containers/ci-fedora-rawhide-cross-mingw32.Dockerfile +++ b/ci/containers/ci-fedora-rawhide-cross-mingw32.Dockerfile @@ -1,20 +1,33 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --cross mingw32 fedora-rawhide libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25... FROM registry.fedoraproject.org/fedora:rawhide -RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ - dnf update -y && \ - dnf install -y \ +RUN dnf install -y nosync && \ + echo -e '#!/bin/sh\n\ +if test -d /usr/lib64\n\ +then\n\ + export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\ +else\n\ + export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\ +fi\n\ +exec "$@"' > /usr/bin/nosync && \ + chmod +x /usr/bin/nosync && \ + nosync dnf update -y --nogpgcheck fedora-gpg-keys && \ + nosync dnf update -y && \ + nosync dnf install -y \ augeas \ bash-completion \ ca-certificates \ ccache \ - clang \ cppi \ diffutils \ dnsmasq \ dwarves \ ebtables \ firewalld-filesystem \ - gcc \ git \ glibc-langpack-en \ iproute \ @@ -43,13 +56,14 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ scrub \ sheepdog \ zfs-fuse && \ - dnf autoremove -y && \ - dnf clean all -y && \ + nosync dnf autoremove -y && \ + nosync dnf clean all -y && \ + rpm -qa | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-$(basename /usr/bin/gcc) -RUN dnf install -y \ +RUN nosync dnf install -y \ mingw32-curl \ mingw32-dbus \ mingw32-dlfcn \ @@ -63,7 +77,7 @@ RUN dnf install -y \ mingw32-pkg-config \ mingw32-portablexdr \ mingw32-readline && \ - dnf clean all -y + nosync dnf clean all -y ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" @@ -72,5 +86,4 @@ ENV PYTHON "/usr/bin/python3" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV ABI "i686-w64-mingw32" -ENV CONFIGURE_OPTS "--host=i686-w64-mingw32" ENV MESON_OPTS "--cross-file=/usr/share/mingw/toolchain-mingw32.meson" diff --git a/ci/containers/ci-fedora-rawhide-cross-mingw64.Dockerfile b/ci/containers/ci-fedora-rawhide-cross-mingw64.Dockerfile index e82de31df9..ff7fb77a04 100644 --- a/ci/containers/ci-fedora-rawhide-cross-mingw64.Dockerfile +++ b/ci/containers/ci-fedora-rawhide-cross-mingw64.Dockerfile @@ -1,20 +1,33 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --cross mingw64 fedora-rawhide libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25... FROM registry.fedoraproject.org/fedora:rawhide -RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ - dnf update -y && \ - dnf install -y \ +RUN dnf install -y nosync && \ + echo -e '#!/bin/sh\n\ +if test -d /usr/lib64\n\ +then\n\ + export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\ +else\n\ + export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\ +fi\n\ +exec "$@"' > /usr/bin/nosync && \ + chmod +x /usr/bin/nosync && \ + nosync dnf update -y --nogpgcheck fedora-gpg-keys && \ + nosync dnf update -y && \ + nosync dnf install -y \ augeas \ bash-completion \ ca-certificates \ ccache \ - clang \ cppi \ diffutils \ dnsmasq \ dwarves \ ebtables \ firewalld-filesystem \ - gcc \ git \ glibc-langpack-en \ iproute \ @@ -43,13 +56,14 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ scrub \ sheepdog \ zfs-fuse && \ - dnf autoremove -y && \ - dnf clean all -y && \ + nosync dnf autoremove -y && \ + nosync dnf clean all -y && \ + rpm -qa | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-$(basename /usr/bin/gcc) -RUN dnf install -y \ +RUN nosync dnf install -y \ mingw64-curl \ mingw64-dbus \ mingw64-dlfcn \ @@ -63,7 +77,7 @@ RUN dnf install -y \ mingw64-pkg-config \ mingw64-portablexdr \ mingw64-readline && \ - dnf clean all -y + nosync dnf clean all -y ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" @@ -72,5 +86,4 @@ ENV PYTHON "/usr/bin/python3" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV ABI "x86_64-w64-mingw32" -ENV CONFIGURE_OPTS "--host=x86_64-w64-mingw32" ENV MESON_OPTS "--cross-file=/usr/share/mingw/toolchain-mingw64.meson" diff --git a/ci/containers/ci-fedora-rawhide.Dockerfile b/ci/containers/ci-fedora-rawhide.Dockerfile index ee2f0fcfc1..539ee0a7c7 100644 --- a/ci/containers/ci-fedora-rawhide.Dockerfile +++ b/ci/containers/ci-fedora-rawhide.Dockerfile @@ -1,8 +1,23 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile fedora-rawhide libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25... FROM registry.fedoraproject.org/fedora:rawhide -RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ - dnf update -y && \ - dnf install -y \ +RUN dnf install -y nosync && \ + echo -e '#!/bin/sh\n\ +if test -d /usr/lib64\n\ +then\n\ + export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\ +else\n\ + export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\ +fi\n\ +exec "$@"' > /usr/bin/nosync && \ + chmod +x /usr/bin/nosync && \ + nosync dnf update -y --nogpgcheck fedora-gpg-keys && \ + nosync dnf update -y && \ + nosync dnf install -y \ audit-libs-devel \ augeas \ avahi-devel \ @@ -81,8 +96,9 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ xfsprogs-devel \ yajl-devel \ zfs-fuse && \ - dnf autoremove -y && \ - dnf clean all -y && \ + nosync dnf autoremove -y && \ + nosync dnf clean all -y && \ + rpm -qa | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) diff --git a/ci/containers/ci-opensuse-151.Dockerfile b/ci/containers/ci-opensuse-151.Dockerfile index c2d088f004..9458d2de0c 100644 --- a/ci/containers/ci-opensuse-151.Dockerfile +++ b/ci/containers/ci-opensuse-151.Dockerfile @@ -1,3 +1,8 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile opensuse-151 libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25... FROM registry.opensuse.org/opensuse/leap:15.1 RUN zypper update -y && \ @@ -80,6 +85,7 @@ RUN zypper update -y && \ xen-devel \ xfsprogs-devel && \ zypper clean --all && \ + rpm -qa | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) diff --git a/ci/containers/ci-ubuntu-1804.Dockerfile b/ci/containers/ci-ubuntu-1804.Dockerfile index 3a5362e128..842412b651 100644 --- a/ci/containers/ci-ubuntu-1804.Dockerfile +++ b/ci/containers/ci-ubuntu-1804.Dockerfile @@ -1,9 +1,15 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile ubuntu-1804 libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25... FROM docker.io/library/ubuntu:18.04 RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ bash-completion \ @@ -83,10 +89,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ xfslibs-dev \ xsltproc \ zfs-fuse && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) diff --git a/ci/containers/ci-ubuntu-2004.Dockerfile b/ci/containers/ci-ubuntu-2004.Dockerfile index 41a3f5995e..de7e63b4a7 100644 --- a/ci/containers/ci-ubuntu-2004.Dockerfile +++ b/ci/containers/ci-ubuntu-2004.Dockerfile @@ -1,9 +1,15 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile ubuntu-2004 libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25... FROM docker.io/library/ubuntu:20.04 RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ bash-completion \ @@ -82,10 +88,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ xfslibs-dev \ xsltproc \ zfs-fuse && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) -- 2.26.2