Notable changes: * cross-building container images are smaller because they no longer include the native compilers; * ccache is enabled for clang builds. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- Pushed under the CI refresh rule. Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/287122672 ci/cirrus/freebsd-12.vars | 7 ++++++- ci/cirrus/freebsd-current.vars | 7 ++++++- ci/cirrus/macos-11.vars | 7 ++++++- ci/containers/centos-7.Dockerfile | 9 ++++++--- ci/containers/centos-8.Dockerfile | 9 ++++++--- ci/containers/centos-stream.Dockerfile | 9 ++++++--- ci/containers/debian-10-cross-aarch64.Dockerfile | 10 +++++----- ci/containers/debian-10-cross-armv6l.Dockerfile | 10 +++++----- ci/containers/debian-10-cross-armv7l.Dockerfile | 10 +++++----- ci/containers/debian-10-cross-i686.Dockerfile | 10 +++++----- ci/containers/debian-10-cross-mips.Dockerfile | 10 +++++----- ci/containers/debian-10-cross-mips64el.Dockerfile | 10 +++++----- ci/containers/debian-10-cross-mipsel.Dockerfile | 10 +++++----- ci/containers/debian-10-cross-ppc64le.Dockerfile | 10 +++++----- ci/containers/debian-10-cross-s390x.Dockerfile | 10 +++++----- ci/containers/debian-10.Dockerfile | 9 ++++++--- ci/containers/debian-sid-cross-aarch64.Dockerfile | 8 ++++---- ci/containers/debian-sid-cross-armv6l.Dockerfile | 8 ++++---- ci/containers/debian-sid-cross-armv7l.Dockerfile | 8 ++++---- ci/containers/debian-sid-cross-i686.Dockerfile | 8 ++++---- ci/containers/debian-sid-cross-mips64el.Dockerfile | 8 ++++---- ci/containers/debian-sid-cross-mipsel.Dockerfile | 8 ++++---- ci/containers/debian-sid-cross-ppc64le.Dockerfile | 8 ++++---- ci/containers/debian-sid-cross-s390x.Dockerfile | 8 ++++---- ci/containers/debian-sid.Dockerfile | 7 +++++-- ci/containers/fedora-32.Dockerfile | 7 +++++-- ci/containers/fedora-33.Dockerfile | 7 +++++-- ci/containers/fedora-rawhide-cross-mingw32.Dockerfile | 6 ++++-- ci/containers/fedora-rawhide-cross-mingw64.Dockerfile | 6 ++++-- ci/containers/fedora-rawhide.Dockerfile | 7 +++++-- ci/containers/opensuse-152.Dockerfile | 9 ++++++--- ci/containers/ubuntu-1804.Dockerfile | 9 ++++++--- ci/containers/ubuntu-2004.Dockerfile | 9 ++++++--- 33 files changed, 165 insertions(+), 113 deletions(-) diff --git a/ci/cirrus/freebsd-12.vars b/ci/cirrus/freebsd-12.vars index 115fd89727..7bd875176e 100644 --- a/ci/cirrus/freebsd-12.vars +++ b/ci/cirrus/freebsd-12.vars @@ -1,5 +1,10 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool variables freebsd-12 libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... + PACKAGING_COMMAND='pkg' -CC='/usr/bin/clang' CCACHE='/usr/local/bin/ccache' MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' diff --git a/ci/cirrus/freebsd-current.vars b/ci/cirrus/freebsd-current.vars index 115fd89727..0f5b704a7b 100644 --- a/ci/cirrus/freebsd-current.vars +++ b/ci/cirrus/freebsd-current.vars @@ -1,5 +1,10 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool variables freebsd-current libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... + PACKAGING_COMMAND='pkg' -CC='/usr/bin/clang' CCACHE='/usr/local/bin/ccache' MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' diff --git a/ci/cirrus/macos-11.vars b/ci/cirrus/macos-11.vars index ba0e77d728..8965338456 100644 --- a/ci/cirrus/macos-11.vars +++ b/ci/cirrus/macos-11.vars @@ -1,5 +1,10 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool variables macos-11 libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... + PACKAGING_COMMAND='brew' -CC='/usr/bin/clang' CCACHE='/usr/local/bin/ccache' MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' diff --git a/ci/containers/centos-7.Dockerfile b/ci/containers/centos-7.Dockerfile index d1de34cedf..49345fa128 100644 --- a/ci/containers/centos-7.Dockerfile +++ b/ci/containers/centos-7.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile centos-7 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a6219513... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... + FROM docker.io/library/centos:7 RUN yum update -y && \ @@ -47,6 +48,7 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\ ca-certificates \ ccache \ clang \ + cpp \ cyrus-sasl-devel \ dbus-devel \ device-mapper-devel \ @@ -123,10 +125,11 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\ 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) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc RUN pip3 install \ - meson==0.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/centos-8.Dockerfile b/ci/containers/centos-8.Dockerfile index d55115fe29..0c7292b8d2 100644 --- a/ci/containers/centos-8.Dockerfile +++ b/ci/containers/centos-8.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile centos-8 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a6219513... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... + FROM docker.io/library/centos:8 RUN dnf update -y && \ @@ -18,6 +19,7 @@ RUN dnf update -y && \ ca-certificates \ ccache \ clang \ + cpp \ cyrus-sasl-devel \ dbus-devel \ device-mapper-devel \ @@ -95,10 +97,11 @@ RUN dnf update -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) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc RUN pip3 install \ - meson==0.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/centos-stream.Dockerfile b/ci/containers/centos-stream.Dockerfile index a6715700c9..3bc66775eb 100644 --- a/ci/containers/centos-stream.Dockerfile +++ b/ci/containers/centos-stream.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile centos-stream libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a6219513... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... + FROM docker.io/library/centos:8 RUN dnf install -y centos-release-stream && \ @@ -20,6 +21,7 @@ RUN dnf install -y centos-release-stream && \ ca-certificates \ ccache \ clang \ + cpp \ cyrus-sasl-devel \ dbus-devel \ device-mapper-devel \ @@ -97,10 +99,11 @@ RUN dnf install -y centos-release-stream && \ 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) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc RUN pip3 install \ - meson==0.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10-cross-aarch64.Dockerfile b/ci/containers/debian-10-cross-aarch64.Dockerfile index 50476a7f5c..e006dcc68b 100644 --- a/ci/containers/debian-10-cross-aarch64.Dockerfile +++ b/ci/containers/debian-10-cross-aarch64.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross aarch64 debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a6219513... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... + FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ 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) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture arm64 && \ @@ -120,7 +120,7 @@ cpu = 'aarch64'\n\ endian = 'little'" > /usr/local/share/meson/cross/aarch64-linux-gnu RUN pip3 install \ - meson==0.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10-cross-armv6l.Dockerfile b/ci/containers/debian-10-cross-armv6l.Dockerfile index aed38f6f3d..abc3ef52db 100644 --- a/ci/containers/debian-10-cross-armv6l.Dockerfile +++ b/ci/containers/debian-10-cross-armv6l.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross armv6l debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a6219513... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... + FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ 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) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture armel && \ @@ -119,7 +119,7 @@ cpu = 'arm'\n\ endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabi RUN pip3 install \ - meson==0.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10-cross-armv7l.Dockerfile b/ci/containers/debian-10-cross-armv7l.Dockerfile index 714e28ad07..2e9bedf614 100644 --- a/ci/containers/debian-10-cross-armv7l.Dockerfile +++ b/ci/containers/debian-10-cross-armv7l.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross armv7l debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a6219513... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... + FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ 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) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture armhf && \ @@ -120,7 +120,7 @@ cpu = 'armhf'\n\ endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabihf RUN pip3 install \ - meson==0.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10-cross-i686.Dockerfile b/ci/containers/debian-10-cross-i686.Dockerfile index 7fcd38ff7b..4b88d751bd 100644 --- a/ci/containers/debian-10-cross-i686.Dockerfile +++ b/ci/containers/debian-10-cross-i686.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross i686 debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a6219513... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... + FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ 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) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture i386 && \ @@ -119,7 +119,7 @@ cpu = 'i686'\n\ endian = 'little'" > /usr/local/share/meson/cross/i686-linux-gnu RUN pip3 install \ - meson==0.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10-cross-mips.Dockerfile b/ci/containers/debian-10-cross-mips.Dockerfile index 09d0653e13..dbdc9c57a8 100644 --- a/ci/containers/debian-10-cross-mips.Dockerfile +++ b/ci/containers/debian-10-cross-mips.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross mips debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a6219513... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... + FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ 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) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips-linux-gnu-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mips && \ @@ -119,7 +119,7 @@ cpu = 'mips'\n\ endian = 'big'" > /usr/local/share/meson/cross/mips-linux-gnu RUN pip3 install \ - meson==0.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10-cross-mips64el.Dockerfile b/ci/containers/debian-10-cross-mips64el.Dockerfile index 07ce89e16f..37044e296d 100644 --- a/ci/containers/debian-10-cross-mips64el.Dockerfile +++ b/ci/containers/debian-10-cross-mips64el.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross mips64el debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a6219513... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... + FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ 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) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mips64el && \ @@ -119,7 +119,7 @@ cpu = 'mips64el'\n\ endian = 'little'" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64 RUN pip3 install \ - meson==0.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10-cross-mipsel.Dockerfile b/ci/containers/debian-10-cross-mipsel.Dockerfile index 644b822302..3587f52374 100644 --- a/ci/containers/debian-10-cross-mipsel.Dockerfile +++ b/ci/containers/debian-10-cross-mipsel.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross mipsel debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a6219513... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... + FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ 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) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mipsel && \ @@ -119,7 +119,7 @@ cpu = 'mipsel'\n\ endian = 'little'" > /usr/local/share/meson/cross/mipsel-linux-gnu RUN pip3 install \ - meson==0.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10-cross-ppc64le.Dockerfile b/ci/containers/debian-10-cross-ppc64le.Dockerfile index f2e61268e9..e8699d896b 100644 --- a/ci/containers/debian-10-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-10-cross-ppc64le.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross ppc64le debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a6219513... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... + FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ 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) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture ppc64el && \ @@ -119,7 +119,7 @@ cpu = 'powerpc64le'\n\ endian = 'little'" > /usr/local/share/meson/cross/powerpc64le-linux-gnu RUN pip3 install \ - meson==0.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10-cross-s390x.Dockerfile b/ci/containers/debian-10-cross-s390x.Dockerfile index e9b89c299a..b31b5fd051 100644 --- a/ci/containers/debian-10-cross-s390x.Dockerfile +++ b/ci/containers/debian-10-cross-s390x.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross s390x debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a6219513... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... + FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ 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) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture s390x && \ @@ -119,7 +119,7 @@ cpu = 's390x'\n\ endian = 'big'" > /usr/local/share/meson/cross/s390x-linux-gnu RUN pip3 install \ - meson==0.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10.Dockerfile b/ci/containers/debian-10.Dockerfile index fbc06b3314..d4ab8196c2 100644 --- a/ci/containers/debian-10.Dockerfile +++ b/ci/containers/debian-10.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a6219513... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... + FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -16,6 +17,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ca-certificates \ ccache \ clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ @@ -97,10 +99,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ 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) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc RUN pip3 install \ - meson==0.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-sid-cross-aarch64.Dockerfile b/ci/containers/debian-sid-cross-aarch64.Dockerfile index 373b9ad31a..514f42a83e 100644 --- a/ci/containers/debian-sid-cross-aarch64.Dockerfile +++ b/ci/containers/debian-sid-cross-aarch64.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross aarch64 debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a6219513... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... + FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -57,7 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ 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) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture arm64 && \ diff --git a/ci/containers/debian-sid-cross-armv6l.Dockerfile b/ci/containers/debian-sid-cross-armv6l.Dockerfile index e32d0fd230..592c485f64 100644 --- a/ci/containers/debian-sid-cross-armv6l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv6l.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross armv6l debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a6219513... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... + FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -57,7 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ 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) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture armel && \ diff --git a/ci/containers/debian-sid-cross-armv7l.Dockerfile b/ci/containers/debian-sid-cross-armv7l.Dockerfile index cc46822665..f4e9829961 100644 --- a/ci/containers/debian-sid-cross-armv7l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv7l.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross armv7l debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a6219513... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... + FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -57,7 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ 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) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture armhf && \ diff --git a/ci/containers/debian-sid-cross-i686.Dockerfile b/ci/containers/debian-sid-cross-i686.Dockerfile index a4cd1c1070..500e306f8b 100644 --- a/ci/containers/debian-sid-cross-i686.Dockerfile +++ b/ci/containers/debian-sid-cross-i686.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross i686 debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a6219513... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... + FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -57,7 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ 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) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture i386 && \ diff --git a/ci/containers/debian-sid-cross-mips64el.Dockerfile b/ci/containers/debian-sid-cross-mips64el.Dockerfile index 76298a7e4e..1ed444d9d3 100644 --- a/ci/containers/debian-sid-cross-mips64el.Dockerfile +++ b/ci/containers/debian-sid-cross-mips64el.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross mips64el debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a6219513... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... + FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -57,7 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ 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) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mips64el && \ diff --git a/ci/containers/debian-sid-cross-mipsel.Dockerfile b/ci/containers/debian-sid-cross-mipsel.Dockerfile index 3c69ce545f..e30e1cf808 100644 --- a/ci/containers/debian-sid-cross-mipsel.Dockerfile +++ b/ci/containers/debian-sid-cross-mipsel.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross mipsel debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a6219513... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... + FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -57,7 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ 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) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mipsel && \ diff --git a/ci/containers/debian-sid-cross-ppc64le.Dockerfile b/ci/containers/debian-sid-cross-ppc64le.Dockerfile index c274e106a0..430cd1176c 100644 --- a/ci/containers/debian-sid-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-sid-cross-ppc64le.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross ppc64le debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a6219513... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... + FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -57,7 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ 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) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture ppc64el && \ diff --git a/ci/containers/debian-sid-cross-s390x.Dockerfile b/ci/containers/debian-sid-cross-s390x.Dockerfile index 7d9120c93e..716002dbaa 100644 --- a/ci/containers/debian-sid-cross-s390x.Dockerfile +++ b/ci/containers/debian-sid-cross-s390x.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross s390x debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a6219513... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... + FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -57,7 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ 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) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture s390x && \ diff --git a/ci/containers/debian-sid.Dockerfile b/ci/containers/debian-sid.Dockerfile index d1141ea307..011b766715 100644 --- a/ci/containers/debian-sid.Dockerfile +++ b/ci/containers/debian-sid.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a6219513... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... + FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -16,6 +17,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ca-certificates \ ccache \ clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ @@ -95,7 +97,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ 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) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/fedora-32.Dockerfile b/ci/containers/fedora-32.Dockerfile index 71c78c76dc..9b06bcbac5 100644 --- a/ci/containers/fedora-32.Dockerfile +++ b/ci/containers/fedora-32.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile fedora-32 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a6219513... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... + FROM registry.fedoraproject.org/fedora:32 RUN dnf install -y nosync && \ @@ -24,6 +25,7 @@ exec "$@"' > /usr/bin/nosync && \ ca-certificates \ ccache \ clang \ + cpp \ cppi \ cyrus-sasl-devel \ dbus-devel \ @@ -103,7 +105,8 @@ exec "$@"' > /usr/bin/nosync && \ 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) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/fedora-33.Dockerfile b/ci/containers/fedora-33.Dockerfile index 08cd40bc3a..2885eafbb0 100644 --- a/ci/containers/fedora-33.Dockerfile +++ b/ci/containers/fedora-33.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile fedora-33 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a6219513... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... + FROM registry.fedoraproject.org/fedora:33 RUN dnf install -y nosync && \ @@ -24,6 +25,7 @@ exec "$@"' > /usr/bin/nosync && \ ca-certificates \ ccache \ clang \ + cpp \ cppi \ cyrus-sasl-devel \ dbus-devel \ @@ -103,7 +105,8 @@ exec "$@"' > /usr/bin/nosync && \ 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) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile index 1ac0c08e4c..139e0b145c 100644 --- a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross mingw32 fedora-rawhide libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a6219513... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... + FROM registry.fedoraproject.org/fedora:rawhide RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ @@ -22,6 +23,7 @@ exec "$@"' > /usr/bin/nosync && \ bash-completion \ ca-certificates \ ccache \ + cpp \ cppi \ diffutils \ dnsmasq \ @@ -63,7 +65,7 @@ exec "$@"' > /usr/bin/nosync && \ 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) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-gcc RUN nosync dnf install -y \ mingw32-curl \ diff --git a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile index 767e43639d..b24049f879 100644 --- a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross mingw64 fedora-rawhide libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a6219513... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... + FROM registry.fedoraproject.org/fedora:rawhide RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ @@ -22,6 +23,7 @@ exec "$@"' > /usr/bin/nosync && \ bash-completion \ ca-certificates \ ccache \ + cpp \ cppi \ diffutils \ dnsmasq \ @@ -63,7 +65,7 @@ exec "$@"' > /usr/bin/nosync && \ 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) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-gcc RUN nosync dnf install -y \ mingw64-curl \ diff --git a/ci/containers/fedora-rawhide.Dockerfile b/ci/containers/fedora-rawhide.Dockerfile index 7cb68dcd50..1f0abb7288 100644 --- a/ci/containers/fedora-rawhide.Dockerfile +++ b/ci/containers/fedora-rawhide.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile fedora-rawhide libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a6219513... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... + FROM registry.fedoraproject.org/fedora:rawhide RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ @@ -25,6 +26,7 @@ exec "$@"' > /usr/bin/nosync && \ ca-certificates \ ccache \ clang \ + cpp \ cppi \ cyrus-sasl-devel \ dbus-devel \ @@ -104,7 +106,8 @@ exec "$@"' > /usr/bin/nosync && \ 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) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/opensuse-152.Dockerfile b/ci/containers/opensuse-152.Dockerfile index 8688934e92..6b56641292 100644 --- a/ci/containers/opensuse-152.Dockerfile +++ b/ci/containers/opensuse-152.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile opensuse-152 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a6219513... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... + FROM registry.opensuse.org/opensuse/leap:15.2 RUN zypper update -y && \ @@ -15,6 +16,7 @@ RUN zypper update -y && \ ca-certificates \ ccache \ clang \ + cpp \ cppi \ cyrus-sasl-devel \ dbus-1-devel \ @@ -91,10 +93,11 @@ RUN zypper update -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) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc RUN pip3 install \ - meson==0.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/ubuntu-1804.Dockerfile b/ci/containers/ubuntu-1804.Dockerfile index 55b7821cba..c6c3ef5823 100644 --- a/ci/containers/ubuntu-1804.Dockerfile +++ b/ci/containers/ubuntu-1804.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile ubuntu-1804 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a6219513... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... + FROM docker.io/library/ubuntu:18.04 RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -16,6 +17,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ca-certificates \ ccache \ clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ @@ -99,10 +101,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ 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) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc RUN pip3 install \ - meson==0.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/ubuntu-2004.Dockerfile b/ci/containers/ubuntu-2004.Dockerfile index 04427b81d0..78df341dca 100644 --- a/ci/containers/ubuntu-2004.Dockerfile +++ b/ci/containers/ubuntu-2004.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile ubuntu-2004 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a6219513... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... + FROM docker.io/library/ubuntu:20.04 RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -16,6 +17,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ca-certificates \ ccache \ clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ @@ -98,10 +100,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ 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) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc RUN pip3 install \ - meson==0.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" -- 2.26.3