NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

ci: Refresh information

Browse Source 
Notable changes:

  * HAL is no longer installed on FreeBSD;

  * the native version of libwsman is no longer installed in
    containers intended for cross-compilation;

  * Meson 0.55 rather than 0.54 is requested when installing
    it from PyPI;

  * GNU sed and GNU grep are installed explicitly everywhere.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
This commit is contained in:
Andrea Bolognani 2021-03-23 15:33:33 +01:00
parent ae1201fab4
commit 228a87d307
33 changed files with 109 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/cirrus/freebsd-12.vars
View File

@ -5,4 +5,4 @@ MAKE='/usr/local/bin/gmake'
NINJA='/usr/local/bin/ninja' NINJA='/usr/local/bin/ninja'
PYTHON='/usr/local/bin/python3' PYTHON='/usr/local/bin/python3'
PIP3='/usr/local/bin/pip-3.7' PIP3='/usr/local/bin/pip-3.7'
PKGS='augeas avahi bash-completion ca_root_nss ccache cppi curl cyrus-sasl dbus diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnutls hal libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py37-docutils py37-flake8 python3 qemu radvd readline yajl' PKGS='augeas avahi bash-completion ca_root_nss ccache cppi curl cyrus-sasl dbus diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py37-docutils py37-flake8 python3 qemu radvd readline yajl'

2
ci/cirrus/freebsd-current.vars
View File

@ -5,4 +5,4 @@ MAKE='/usr/local/bin/gmake'
NINJA='/usr/local/bin/ninja' NINJA='/usr/local/bin/ninja'
PYTHON='/usr/local/bin/python3' PYTHON='/usr/local/bin/python3'
PIP3='/usr/local/bin/pip-3.7' PIP3='/usr/local/bin/pip-3.7'
PKGS='augeas avahi bash-completion ca_root_nss ccache cppi curl cyrus-sasl dbus diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnutls hal libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py37-docutils py37-flake8 python3 qemu radvd readline yajl' PKGS='augeas avahi bash-completion ca_root_nss ccache cppi curl cyrus-sasl dbus diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py37-docutils py37-flake8 python3 qemu radvd readline yajl'

2
ci/cirrus/macos-11.vars
View File

@ -5,4 +5,4 @@ MAKE='/usr/local/bin/gmake'
NINJA='/usr/local/bin/ninja' NINJA='/usr/local/bin/ninja'
PYTHON='/usr/local/bin/python3' PYTHON='/usr/local/bin/python3'
PIP3='/usr/local/bin/pip3' PIP3='/usr/local/bin/pip3'
PKGS='augeas bash-completion ccache cppi curl dbus diffutils dnsmasq docutils flake8 gettext git glib gnutls libiscsi libpcap libssh libssh2 libxml2 libxslt make meson ninja perl pkg-config python3 qemu readline rpcgen scrub yajl' PKGS='augeas bash-completion ccache cppi curl dbus diffutils dnsmasq docutils flake8 gettext git glib gnu-sed gnutls grep libiscsi libpcap libssh libssh2 libxml2 libxslt make meson ninja perl pkg-config python3 qemu readline rpcgen scrub yajl'

6
ci/containers/centos-7.Dockerfile
View File

@ -2,7 +2,7 @@
# #
# $ lcitool dockerfile centos-7 libvirt # $ lcitool dockerfile centos-7 libvirt
# #
# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a # https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355800d8135ce82
FROM docker.io/library/centos:7 FROM docker.io/library/centos:7
RUN yum update -y && \ RUN yum update -y && \
@ -64,6 +64,7 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\
glibc-devel \ glibc-devel \
glusterfs-api-devel \ glusterfs-api-devel \
gnutls-devel \ gnutls-devel \
grep \
iproute \ iproute \
iptables \ iptables \
iscsi-initiator-utils \ iscsi-initiator-utils \
@ -111,6 +112,7 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\
rpm-build \ rpm-build \
sanlock-devel \ sanlock-devel \
scrub \ scrub \
sed \
systemtap-sdt-devel \ systemtap-sdt-devel \
wireshark-devel \ wireshark-devel \
xen-devel \ xen-devel \
@ -124,7 +126,7 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
RUN pip3 install \ RUN pip3 install \
meson==0.54.0 meson==0.55.3
ENV LANG "en_US.UTF-8" ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make" ENV MAKE "/usr/bin/make"

6
ci/containers/centos-8.Dockerfile
View File

@ -2,7 +2,7 @@
# #
# $ lcitool dockerfile centos-8 libvirt # $ lcitool dockerfile centos-8 libvirt
# #
# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a # https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355800d8135ce82
FROM docker.io/library/centos:8 FROM docker.io/library/centos:8
RUN dnf update -y && \ RUN dnf update -y && \
@ -35,6 +35,7 @@ RUN dnf update -y && \
glibc-langpack-en \ glibc-langpack-en \
glusterfs-api-devel \ glusterfs-api-devel \
gnutls-devel \ gnutls-devel \
grep \
iproute \ iproute \
iproute-tc \ iproute-tc \
iptables \ iptables \
@ -84,6 +85,7 @@ RUN dnf update -y && \
rpm-build \ rpm-build \
sanlock-devel \ sanlock-devel \
scrub \ scrub \
sed \
systemtap-sdt-devel \ systemtap-sdt-devel \
wireshark-devel \ wireshark-devel \
xfsprogs-devel \ xfsprogs-devel \
@ -96,7 +98,7 @@ RUN dnf update -y && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
RUN pip3 install \ RUN pip3 install \
meson==0.54.0 meson==0.55.3
ENV LANG "en_US.UTF-8" ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make" ENV MAKE "/usr/bin/make"

6
ci/containers/centos-stream.Dockerfile
View File

@ -2,7 +2,7 @@
# #
# $ lcitool dockerfile centos-stream libvirt # $ lcitool dockerfile centos-stream libvirt
# #
# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a # https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355800d8135ce82
FROM docker.io/library/centos:8 FROM docker.io/library/centos:8
RUN dnf install -y centos-release-stream && \ RUN dnf install -y centos-release-stream && \
@ -37,6 +37,7 @@ RUN dnf install -y centos-release-stream && \
glibc-langpack-en \ glibc-langpack-en \
glusterfs-api-devel \ glusterfs-api-devel \
gnutls-devel \ gnutls-devel \
grep \
iproute \ iproute \
iproute-tc \ iproute-tc \
iptables \ iptables \
@ -86,6 +87,7 @@ RUN dnf install -y centos-release-stream && \
rpm-build \ rpm-build \
sanlock-devel \ sanlock-devel \
scrub \ scrub \
sed \
systemtap-sdt-devel \ systemtap-sdt-devel \
wireshark-devel \ wireshark-devel \
xfsprogs-devel \ xfsprogs-devel \
@ -98,7 +100,7 @@ RUN dnf install -y centos-release-stream && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
RUN pip3 install \ RUN pip3 install \
meson==0.54.0 meson==0.55.3
ENV LANG "en_US.UTF-8" ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make" ENV MAKE "/usr/bin/make"

6
ci/containers/debian-10-cross-aarch64.Dockerfile
View File

@ -2,7 +2,7 @@
# #
# $ lcitool dockerfile --cross aarch64 debian-10 libvirt # $ lcitool dockerfile --cross aarch64 debian-10 libvirt
# #
# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a # https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355800d8135ce82
FROM docker.io/library/debian:10-slim FROM docker.io/library/debian:10-slim
RUN export DEBIAN_FRONTEND=noninteractive && \ RUN export DEBIAN_FRONTEND=noninteractive && \
@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
gcc \ gcc \
gettext \ gettext \
git \ git \
grep \
iproute2 \ iproute2 \
iptables \ iptables \
kmod \ kmod \
@ -48,6 +49,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
qemu-utils \ qemu-utils \
radvd \ radvd \
scrub \ scrub \
sed \
xsltproc \ xsltproc \
zfs-fuse && \ zfs-fuse && \
eatmydata apt-get autoremove -y && \ eatmydata apt-get autoremove -y && \
@ -118,7 +120,7 @@ cpu = 'aarch64'\n\
endian = 'little'" > /usr/local/share/meson/cross/aarch64-linux-gnu endian = 'little'" > /usr/local/share/meson/cross/aarch64-linux-gnu
RUN pip3 install \ RUN pip3 install \
meson==0.54.0 meson==0.55.3
ENV LANG "en_US.UTF-8" ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make" ENV MAKE "/usr/bin/make"

6
ci/containers/debian-10-cross-armv6l.Dockerfile
View File

@ -2,7 +2,7 @@
# #
# $ lcitool dockerfile --cross armv6l debian-10 libvirt # $ lcitool dockerfile --cross armv6l debian-10 libvirt
# #
# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a # https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355800d8135ce82
FROM docker.io/library/debian:10-slim FROM docker.io/library/debian:10-slim
RUN export DEBIAN_FRONTEND=noninteractive && \ RUN export DEBIAN_FRONTEND=noninteractive && \
@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
gcc \ gcc \
gettext \ gettext \
git \ git \
grep \
iproute2 \ iproute2 \
iptables \ iptables \
kmod \ kmod \
@ -48,6 +49,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
qemu-utils \ qemu-utils \
radvd \ radvd \
scrub \ scrub \
sed \
xsltproc \ xsltproc \
zfs-fuse && \ zfs-fuse && \
eatmydata apt-get autoremove -y && \ eatmydata apt-get autoremove -y && \
@ -117,7 +119,7 @@ cpu = 'arm'\n\
endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabi endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabi
RUN pip3 install \ RUN pip3 install \
meson==0.54.0 meson==0.55.3
ENV LANG "en_US.UTF-8" ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make" ENV MAKE "/usr/bin/make"

6
ci/containers/debian-10-cross-armv7l.Dockerfile
View File

@ -2,7 +2,7 @@
# #
# $ lcitool dockerfile --cross armv7l debian-10 libvirt # $ lcitool dockerfile --cross armv7l debian-10 libvirt
# #
# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a # https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355800d8135ce82
FROM docker.io/library/debian:10-slim FROM docker.io/library/debian:10-slim
RUN export DEBIAN_FRONTEND=noninteractive && \ RUN export DEBIAN_FRONTEND=noninteractive && \
@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
gcc \ gcc \
gettext \ gettext \
git \ git \
grep \
iproute2 \ iproute2 \
iptables \ iptables \
kmod \ kmod \
@ -48,6 +49,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
qemu-utils \ qemu-utils \
radvd \ radvd \
scrub \ scrub \
sed \
xsltproc \ xsltproc \
zfs-fuse && \ zfs-fuse && \
eatmydata apt-get autoremove -y && \ eatmydata apt-get autoremove -y && \
@ -118,7 +120,7 @@ cpu = 'armhf'\n\
endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabihf endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabihf
RUN pip3 install \ RUN pip3 install \
meson==0.54.0 meson==0.55.3
ENV LANG "en_US.UTF-8" ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make" ENV MAKE "/usr/bin/make"

6
ci/containers/debian-10-cross-i686.Dockerfile
View File

@ -2,7 +2,7 @@
# #
# $ lcitool dockerfile --cross i686 debian-10 libvirt # $ lcitool dockerfile --cross i686 debian-10 libvirt
# #
# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a # https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355800d8135ce82
FROM docker.io/library/debian:10-slim FROM docker.io/library/debian:10-slim
RUN export DEBIAN_FRONTEND=noninteractive && \ RUN export DEBIAN_FRONTEND=noninteractive && \
@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
gcc \ gcc \
gettext \ gettext \
git \ git \
grep \
iproute2 \ iproute2 \
iptables \ iptables \
kmod \ kmod \
@ -48,6 +49,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
qemu-utils \ qemu-utils \
radvd \ radvd \
scrub \ scrub \
sed \
xsltproc \ xsltproc \
zfs-fuse && \ zfs-fuse && \
eatmydata apt-get autoremove -y && \ eatmydata apt-get autoremove -y && \
@ -117,7 +119,7 @@ cpu = 'i686'\n\
endian = 'little'" > /usr/local/share/meson/cross/i686-linux-gnu endian = 'little'" > /usr/local/share/meson/cross/i686-linux-gnu
RUN pip3 install \ RUN pip3 install \
meson==0.54.0 meson==0.55.3
ENV LANG "en_US.UTF-8" ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make" ENV MAKE "/usr/bin/make"

6
ci/containers/debian-10-cross-mips.Dockerfile
View File

@ -2,7 +2,7 @@
# #
# $ lcitool dockerfile --cross mips debian-10 libvirt # $ lcitool dockerfile --cross mips debian-10 libvirt
# #
# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a # https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355800d8135ce82
FROM docker.io/library/debian:10-slim FROM docker.io/library/debian:10-slim
RUN export DEBIAN_FRONTEND=noninteractive && \ RUN export DEBIAN_FRONTEND=noninteractive && \
@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
gcc \ gcc \
gettext \ gettext \
git \ git \
grep \
iproute2 \ iproute2 \
iptables \ iptables \
kmod \ kmod \
@ -48,6 +49,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
qemu-utils \ qemu-utils \
radvd \ radvd \
scrub \ scrub \
sed \
xsltproc \ xsltproc \
zfs-fuse && \ zfs-fuse && \
eatmydata apt-get autoremove -y && \ eatmydata apt-get autoremove -y && \
@ -117,7 +119,7 @@ cpu = 'mips'\n\
endian = 'big'" > /usr/local/share/meson/cross/mips-linux-gnu endian = 'big'" > /usr/local/share/meson/cross/mips-linux-gnu
RUN pip3 install \ RUN pip3 install \
meson==0.54.0 meson==0.55.3
ENV LANG "en_US.UTF-8" ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make" ENV MAKE "/usr/bin/make"

6
ci/containers/debian-10-cross-mips64el.Dockerfile
View File

@ -2,7 +2,7 @@
# #
# $ lcitool dockerfile --cross mips64el debian-10 libvirt # $ lcitool dockerfile --cross mips64el debian-10 libvirt
# #
# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a # https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355800d8135ce82
FROM docker.io/library/debian:10-slim FROM docker.io/library/debian:10-slim
RUN export DEBIAN_FRONTEND=noninteractive && \ RUN export DEBIAN_FRONTEND=noninteractive && \
@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
gcc \ gcc \
gettext \ gettext \
git \ git \
grep \
iproute2 \ iproute2 \
iptables \ iptables \
kmod \ kmod \
@ -48,6 +49,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
qemu-utils \ qemu-utils \
radvd \ radvd \
scrub \ scrub \
sed \
xsltproc \ xsltproc \
zfs-fuse && \ zfs-fuse && \
eatmydata apt-get autoremove -y && \ eatmydata apt-get autoremove -y && \
@ -117,7 +119,7 @@ cpu = 'mips64el'\n\
endian = 'little'" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64 endian = 'little'" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64
RUN pip3 install \ RUN pip3 install \
meson==0.54.0 meson==0.55.3
ENV LANG "en_US.UTF-8" ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make" ENV MAKE "/usr/bin/make"

6
ci/containers/debian-10-cross-mipsel.Dockerfile
View File

@ -2,7 +2,7 @@
# #
# $ lcitool dockerfile --cross mipsel debian-10 libvirt # $ lcitool dockerfile --cross mipsel debian-10 libvirt
# #
# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a # https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355800d8135ce82
FROM docker.io/library/debian:10-slim FROM docker.io/library/debian:10-slim
RUN export DEBIAN_FRONTEND=noninteractive && \ RUN export DEBIAN_FRONTEND=noninteractive && \
@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
gcc \ gcc \
gettext \ gettext \
git \ git \
grep \
iproute2 \ iproute2 \
iptables \ iptables \
kmod \ kmod \
@ -48,6 +49,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
qemu-utils \ qemu-utils \
radvd \ radvd \
scrub \ scrub \
sed \
xsltproc \ xsltproc \
zfs-fuse && \ zfs-fuse && \
eatmydata apt-get autoremove -y && \ eatmydata apt-get autoremove -y && \
@ -117,7 +119,7 @@ cpu = 'mipsel'\n\
endian = 'little'" > /usr/local/share/meson/cross/mipsel-linux-gnu endian = 'little'" > /usr/local/share/meson/cross/mipsel-linux-gnu
RUN pip3 install \ RUN pip3 install \
meson==0.54.0 meson==0.55.3
ENV LANG "en_US.UTF-8" ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make" ENV MAKE "/usr/bin/make"

6
ci/containers/debian-10-cross-ppc64le.Dockerfile
View File

@ -2,7 +2,7 @@
# #
# $ lcitool dockerfile --cross ppc64le debian-10 libvirt # $ lcitool dockerfile --cross ppc64le debian-10 libvirt
# #
# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a # https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355800d8135ce82
FROM docker.io/library/debian:10-slim FROM docker.io/library/debian:10-slim
RUN export DEBIAN_FRONTEND=noninteractive && \ RUN export DEBIAN_FRONTEND=noninteractive && \
@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
gcc \ gcc \
gettext \ gettext \
git \ git \
grep \
iproute2 \ iproute2 \
iptables \ iptables \
kmod \ kmod \
@ -48,6 +49,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
qemu-utils \ qemu-utils \
radvd \ radvd \
scrub \ scrub \
sed \
xsltproc \ xsltproc \
zfs-fuse && \ zfs-fuse && \
eatmydata apt-get autoremove -y && \ eatmydata apt-get autoremove -y && \
@ -117,7 +119,7 @@ cpu = 'powerpc64le'\n\
endian = 'little'" > /usr/local/share/meson/cross/powerpc64le-linux-gnu endian = 'little'" > /usr/local/share/meson/cross/powerpc64le-linux-gnu
RUN pip3 install \ RUN pip3 install \
meson==0.54.0 meson==0.55.3
ENV LANG "en_US.UTF-8" ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make" ENV MAKE "/usr/bin/make"

6
ci/containers/debian-10-cross-s390x.Dockerfile
View File

@ -2,7 +2,7 @@
# #
# $ lcitool dockerfile --cross s390x debian-10 libvirt # $ lcitool dockerfile --cross s390x debian-10 libvirt
# #
# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a # https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355800d8135ce82
FROM docker.io/library/debian:10-slim FROM docker.io/library/debian:10-slim
RUN export DEBIAN_FRONTEND=noninteractive && \ RUN export DEBIAN_FRONTEND=noninteractive && \
@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
gcc \ gcc \
gettext \ gettext \
git \ git \
grep \
iproute2 \ iproute2 \
iptables \ iptables \
kmod \ kmod \
@ -48,6 +49,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
qemu-utils \ qemu-utils \
radvd \ radvd \
scrub \ scrub \
sed \
xsltproc \ xsltproc \
zfs-fuse && \ zfs-fuse && \
eatmydata apt-get autoremove -y && \ eatmydata apt-get autoremove -y && \
@ -117,7 +119,7 @@ cpu = 's390x'\n\
endian = 'big'" > /usr/local/share/meson/cross/s390x-linux-gnu endian = 'big'" > /usr/local/share/meson/cross/s390x-linux-gnu
RUN pip3 install \ RUN pip3 install \
meson==0.54.0 meson==0.55.3
ENV LANG "en_US.UTF-8" ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make" ENV MAKE "/usr/bin/make"

6
ci/containers/debian-10.Dockerfile
View File

@ -2,7 +2,7 @@
# #
# $ lcitool dockerfile debian-10 libvirt # $ lcitool dockerfile debian-10 libvirt
# #
# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a # https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355800d8135ce82
FROM docker.io/library/debian:10-slim FROM docker.io/library/debian:10-slim
RUN export DEBIAN_FRONTEND=noninteractive && \ RUN export DEBIAN_FRONTEND=noninteractive && \
@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
gcc \ gcc \
gettext \ gettext \
git \ git \
grep \
iproute2 \ iproute2 \
iptables \ iptables \
kmod \ kmod \
@ -83,6 +84,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
qemu-utils \ qemu-utils \
radvd \ radvd \
scrub \ scrub \
sed \
systemtap-sdt-dev \ systemtap-sdt-dev \
wireshark-dev \ wireshark-dev \
xfslibs-dev \ xfslibs-dev \
@ -98,7 +100,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
RUN pip3 install \ RUN pip3 install \
meson==0.54.0 meson==0.55.3
ENV LANG "en_US.UTF-8" ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make" ENV MAKE "/usr/bin/make"

4
ci/containers/debian-sid-cross-aarch64.Dockerfile
View File

@ -2,7 +2,7 @@
# #
# $ lcitool dockerfile --cross aarch64 debian-sid libvirt # $ lcitool dockerfile --cross aarch64 debian-sid libvirt
# #
# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a # https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355800d8135ce82
FROM docker.io/library/debian:sid-slim FROM docker.io/library/debian:sid-slim
RUN export DEBIAN_FRONTEND=noninteractive && \ RUN export DEBIAN_FRONTEND=noninteractive && \
@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
gcc \ gcc \
gettext \ gettext \
git \ git \
grep \
iproute2 \ iproute2 \
iptables \ iptables \
kmod \ kmod \
@ -46,6 +47,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
qemu-utils \ qemu-utils \
radvd \ radvd \
scrub \ scrub \
sed \
xsltproc \ xsltproc \
zfs-fuse && \ zfs-fuse && \
eatmydata apt-get autoremove -y && \ eatmydata apt-get autoremove -y && \

4
ci/containers/debian-sid-cross-armv6l.Dockerfile
View File

@ -2,7 +2,7 @@
# #
# $ lcitool dockerfile --cross armv6l debian-sid libvirt # $ lcitool dockerfile --cross armv6l debian-sid libvirt
# #
# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a # https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355800d8135ce82
FROM docker.io/library/debian:sid-slim FROM docker.io/library/debian:sid-slim
RUN export DEBIAN_FRONTEND=noninteractive && \ RUN export DEBIAN_FRONTEND=noninteractive && \
@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
gcc \ gcc \
gettext \ gettext \
git \ git \
grep \
iproute2 \ iproute2 \
iptables \ iptables \
kmod \ kmod \
@ -46,6 +47,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
qemu-utils \ qemu-utils \
radvd \ radvd \
scrub \ scrub \
sed \
xsltproc \ xsltproc \
zfs-fuse && \ zfs-fuse && \
eatmydata apt-get autoremove -y && \ eatmydata apt-get autoremove -y && \

4
ci/containers/debian-sid-cross-armv7l.Dockerfile
View File

@ -2,7 +2,7 @@
# #
# $ lcitool dockerfile --cross armv7l debian-sid libvirt # $ lcitool dockerfile --cross armv7l debian-sid libvirt
# #
# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a # https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355800d8135ce82
FROM docker.io/library/debian:sid-slim FROM docker.io/library/debian:sid-slim
RUN export DEBIAN_FRONTEND=noninteractive && \ RUN export DEBIAN_FRONTEND=noninteractive && \
@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
gcc \ gcc \
gettext \ gettext \
git \ git \
grep \
iproute2 \ iproute2 \
iptables \ iptables \
kmod \ kmod \
@ -46,6 +47,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
qemu-utils \ qemu-utils \
radvd \ radvd \
scrub \ scrub \
sed \
xsltproc \ xsltproc \
zfs-fuse && \ zfs-fuse && \
eatmydata apt-get autoremove -y && \ eatmydata apt-get autoremove -y && \

4
ci/containers/debian-sid-cross-i686.Dockerfile
View File

@ -2,7 +2,7 @@
# #
# $ lcitool dockerfile --cross i686 debian-sid libvirt # $ lcitool dockerfile --cross i686 debian-sid libvirt
# #
# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a # https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355800d8135ce82
FROM docker.io/library/debian:sid-slim FROM docker.io/library/debian:sid-slim
RUN export DEBIAN_FRONTEND=noninteractive && \ RUN export DEBIAN_FRONTEND=noninteractive && \
@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
gcc \ gcc \
gettext \ gettext \
git \ git \
grep \
iproute2 \ iproute2 \
iptables \ iptables \
kmod \ kmod \
@ -46,6 +47,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
qemu-utils \ qemu-utils \
radvd \ radvd \
scrub \ scrub \
sed \
xsltproc \ xsltproc \
zfs-fuse && \ zfs-fuse && \
eatmydata apt-get autoremove -y && \ eatmydata apt-get autoremove -y && \

4
ci/containers/debian-sid-cross-mips64el.Dockerfile
View File

@ -2,7 +2,7 @@
# #
# $ lcitool dockerfile --cross mips64el debian-sid libvirt # $ lcitool dockerfile --cross mips64el debian-sid libvirt
# #
# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a # https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355800d8135ce82
FROM docker.io/library/debian:sid-slim FROM docker.io/library/debian:sid-slim
RUN export DEBIAN_FRONTEND=noninteractive && \ RUN export DEBIAN_FRONTEND=noninteractive && \
@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
gcc \ gcc \
gettext \ gettext \
git \ git \
grep \
iproute2 \ iproute2 \
iptables \ iptables \
kmod \ kmod \
@ -46,6 +47,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
qemu-utils \ qemu-utils \
radvd \ radvd \
scrub \ scrub \
sed \
xsltproc \ xsltproc \
zfs-fuse && \ zfs-fuse && \
eatmydata apt-get autoremove -y && \ eatmydata apt-get autoremove -y && \

4
ci/containers/debian-sid-cross-mipsel.Dockerfile
View File

@ -2,7 +2,7 @@
# #
# $ lcitool dockerfile --cross mipsel debian-sid libvirt # $ lcitool dockerfile --cross mipsel debian-sid libvirt
# #
# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a # https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355800d8135ce82
FROM docker.io/library/debian:sid-slim FROM docker.io/library/debian:sid-slim
RUN export DEBIAN_FRONTEND=noninteractive && \ RUN export DEBIAN_FRONTEND=noninteractive && \
@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
gcc \ gcc \
gettext \ gettext \
git \ git \
grep \
iproute2 \ iproute2 \
iptables \ iptables \
kmod \ kmod \
@ -46,6 +47,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
qemu-utils \ qemu-utils \
radvd \ radvd \
scrub \ scrub \
sed \
xsltproc \ xsltproc \
zfs-fuse && \ zfs-fuse && \
eatmydata apt-get autoremove -y && \ eatmydata apt-get autoremove -y && \

4
ci/containers/debian-sid-cross-ppc64le.Dockerfile
View File

@ -2,7 +2,7 @@
# #
# $ lcitool dockerfile --cross ppc64le debian-sid libvirt # $ lcitool dockerfile --cross ppc64le debian-sid libvirt
# #
# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a # https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355800d8135ce82
FROM docker.io/library/debian:sid-slim FROM docker.io/library/debian:sid-slim
RUN export DEBIAN_FRONTEND=noninteractive && \ RUN export DEBIAN_FRONTEND=noninteractive && \
@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
gcc \ gcc \
gettext \ gettext \
git \ git \
grep \
iproute2 \ iproute2 \
iptables \ iptables \
kmod \ kmod \
@ -46,6 +47,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
qemu-utils \ qemu-utils \
radvd \ radvd \
scrub \ scrub \
sed \
xsltproc \ xsltproc \
zfs-fuse && \ zfs-fuse && \
eatmydata apt-get autoremove -y && \ eatmydata apt-get autoremove -y && \

4
ci/containers/debian-sid-cross-s390x.Dockerfile
View File

@ -2,7 +2,7 @@
# #
# $ lcitool dockerfile --cross s390x debian-sid libvirt # $ lcitool dockerfile --cross s390x debian-sid libvirt
# #
# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a # https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355800d8135ce82
FROM docker.io/library/debian:sid-slim FROM docker.io/library/debian:sid-slim
RUN export DEBIAN_FRONTEND=noninteractive && \ RUN export DEBIAN_FRONTEND=noninteractive && \
@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
gcc \ gcc \
gettext \ gettext \
git \ git \
grep \
iproute2 \ iproute2 \
iptables \ iptables \
kmod \ kmod \
@ -46,6 +47,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
qemu-utils \ qemu-utils \
radvd \ radvd \
scrub \ scrub \
sed \
xsltproc \ xsltproc \
zfs-fuse && \ zfs-fuse && \
eatmydata apt-get autoremove -y && \ eatmydata apt-get autoremove -y && \

4
ci/containers/debian-sid.Dockerfile
View File

@ -2,7 +2,7 @@
# #
# $ lcitool dockerfile debian-sid libvirt # $ lcitool dockerfile debian-sid libvirt
# #
# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a # https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355800d8135ce82
FROM docker.io/library/debian:sid-slim FROM docker.io/library/debian:sid-slim
RUN export DEBIAN_FRONTEND=noninteractive && \ RUN export DEBIAN_FRONTEND=noninteractive && \
@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
gcc \ gcc \
gettext \ gettext \
git \ git \
grep \
iproute2 \ iproute2 \
iptables \ iptables \
kmod \ kmod \
@ -81,6 +82,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
qemu-utils \ qemu-utils \
radvd \ radvd \
scrub \ scrub \
sed \
systemtap-sdt-dev \ systemtap-sdt-dev \
wireshark-dev \ wireshark-dev \
xfslibs-dev \ xfslibs-dev \

4
ci/containers/fedora-32.Dockerfile
View File

@ -2,7 +2,7 @@
# #
# $ lcitool dockerfile fedora-32 libvirt # $ lcitool dockerfile fedora-32 libvirt
# #
# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a # https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355800d8135ce82
FROM registry.fedoraproject.org/fedora:32 FROM registry.fedoraproject.org/fedora:32
RUN dnf install -y nosync && \ RUN dnf install -y nosync && \
@ -42,6 +42,7 @@ exec "$@"' > /usr/bin/nosync && \
glibc-langpack-en \ glibc-langpack-en \
glusterfs-api-devel \ glusterfs-api-devel \
gnutls-devel \ gnutls-devel \
grep \
iproute \ iproute \
iproute-tc \ iproute-tc \
iptables \ iptables \
@ -89,6 +90,7 @@ exec "$@"' > /usr/bin/nosync && \
rpm-build \ rpm-build \
sanlock-devel \ sanlock-devel \
scrub \ scrub \
sed \
sheepdog \ sheepdog \
systemtap-sdt-devel \ systemtap-sdt-devel \
wireshark-devel \ wireshark-devel \

4
ci/containers/fedora-33.Dockerfile
View File

@ -2,7 +2,7 @@
# #
# $ lcitool dockerfile fedora-33 libvirt # $ lcitool dockerfile fedora-33 libvirt
# #
# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a # https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355800d8135ce82
FROM registry.fedoraproject.org/fedora:33 FROM registry.fedoraproject.org/fedora:33
RUN dnf install -y nosync && \ RUN dnf install -y nosync && \
@ -42,6 +42,7 @@ exec "$@"' > /usr/bin/nosync && \
glibc-langpack-en \ glibc-langpack-en \
glusterfs-api-devel \ glusterfs-api-devel \
gnutls-devel \ gnutls-devel \
grep \
iproute \ iproute \
iproute-tc \ iproute-tc \
iptables \ iptables \
@ -89,6 +90,7 @@ exec "$@"' > /usr/bin/nosync && \
rpm-build \ rpm-build \
sanlock-devel \ sanlock-devel \
scrub \ scrub \
sed \
sheepdog \ sheepdog \
systemtap-sdt-devel \ systemtap-sdt-devel \
wireshark-devel \ wireshark-devel \

5
ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
View File

@ -2,7 +2,7 @@
# #
# $ lcitool dockerfile --cross mingw32 fedora-rawhide libvirt # $ lcitool dockerfile --cross mingw32 fedora-rawhide libvirt
# #
# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a # https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355800d8135ce82
FROM registry.fedoraproject.org/fedora:rawhide FROM registry.fedoraproject.org/fedora:rawhide
RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
@ -30,12 +30,12 @@ exec "$@"' > /usr/bin/nosync && \
firewalld-filesystem \ firewalld-filesystem \
git \ git \
glibc-langpack-en \ glibc-langpack-en \
grep \
iproute \ iproute \
iproute-tc \ iproute-tc \
iptables \ iptables \
iscsi-initiator-utils \ iscsi-initiator-utils \
kmod \ kmod \
libwsman-devel \
libxml2 \ libxml2 \
libxslt \ libxslt \
lvm2 \ lvm2 \
@ -55,6 +55,7 @@ exec "$@"' > /usr/bin/nosync && \
rpcgen \ rpcgen \
rpm-build \ rpm-build \
scrub \ scrub \
sed \
sheepdog \ sheepdog \
zfs-fuse && \ zfs-fuse && \
nosync dnf autoremove -y && \ nosync dnf autoremove -y && \

5
ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
View File

@ -2,7 +2,7 @@
# #
# $ lcitool dockerfile --cross mingw64 fedora-rawhide libvirt # $ lcitool dockerfile --cross mingw64 fedora-rawhide libvirt
# #
# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a # https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355800d8135ce82
FROM registry.fedoraproject.org/fedora:rawhide FROM registry.fedoraproject.org/fedora:rawhide
RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
@ -30,12 +30,12 @@ exec "$@"' > /usr/bin/nosync && \
firewalld-filesystem \ firewalld-filesystem \
git \ git \
glibc-langpack-en \ glibc-langpack-en \
grep \
iproute \ iproute \
iproute-tc \ iproute-tc \
iptables \ iptables \
iscsi-initiator-utils \ iscsi-initiator-utils \
kmod \ kmod \
libwsman-devel \
libxml2 \ libxml2 \
libxslt \ libxslt \
lvm2 \ lvm2 \
@ -55,6 +55,7 @@ exec "$@"' > /usr/bin/nosync && \
rpcgen \ rpcgen \
rpm-build \ rpm-build \
scrub \ scrub \
sed \
sheepdog \ sheepdog \
zfs-fuse && \ zfs-fuse && \
nosync dnf autoremove -y && \ nosync dnf autoremove -y && \

4
ci/containers/fedora-rawhide.Dockerfile
View File

@ -2,7 +2,7 @@
# #
# $ lcitool dockerfile fedora-rawhide libvirt # $ lcitool dockerfile fedora-rawhide libvirt
# #
# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a # https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355800d8135ce82
FROM registry.fedoraproject.org/fedora:rawhide FROM registry.fedoraproject.org/fedora:rawhide
RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
@ -43,6 +43,7 @@ exec "$@"' > /usr/bin/nosync && \
glibc-langpack-en \ glibc-langpack-en \
glusterfs-api-devel \ glusterfs-api-devel \
gnutls-devel \ gnutls-devel \
grep \
iproute \ iproute \
iproute-tc \ iproute-tc \
iptables \ iptables \
@ -90,6 +91,7 @@ exec "$@"' > /usr/bin/nosync && \
rpm-build \ rpm-build \
sanlock-devel \ sanlock-devel \
scrub \ scrub \
sed \
sheepdog \ sheepdog \
systemtap-sdt-devel \ systemtap-sdt-devel \
wireshark-devel \ wireshark-devel \

6
ci/containers/opensuse-152.Dockerfile
View File

@ -2,7 +2,7 @@
# #
# $ lcitool dockerfile opensuse-152 libvirt # $ lcitool dockerfile opensuse-152 libvirt
# #
# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a # https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355800d8135ce82
FROM registry.opensuse.org/opensuse/leap:15.2 FROM registry.opensuse.org/opensuse/leap:15.2
RUN zypper update -y && \ RUN zypper update -y && \
@ -31,6 +31,7 @@ RUN zypper update -y && \
glibc-devel \ glibc-devel \
glibc-locale \ glibc-locale \
glusterfs-devel \ glusterfs-devel \
grep \
iproute2 \ iproute2 \
iptables \ iptables \
kmod \ kmod \
@ -81,6 +82,7 @@ RUN zypper update -y && \
rpm-build \ rpm-build \
sanlock-devel \ sanlock-devel \
scrub \ scrub \
sed \
systemtap-sdt-devel \ systemtap-sdt-devel \
wireshark-devel \ wireshark-devel \
xen-devel \ xen-devel \
@ -92,7 +94,7 @@ RUN zypper update -y && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
RUN pip3 install \ RUN pip3 install \
meson==0.54.0 meson==0.55.3
ENV LANG "en_US.UTF-8" ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make" ENV MAKE "/usr/bin/make"

6
ci/containers/ubuntu-1804.Dockerfile
View File

@ -2,7 +2,7 @@
# #
# $ lcitool dockerfile ubuntu-1804 libvirt # $ lcitool dockerfile ubuntu-1804 libvirt
# #
# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a # https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355800d8135ce82
FROM docker.io/library/ubuntu:18.04 FROM docker.io/library/ubuntu:18.04
RUN export DEBIAN_FRONTEND=noninteractive && \ RUN export DEBIAN_FRONTEND=noninteractive && \
@ -25,6 +25,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
gettext \ gettext \
git \ git \
glusterfs-common \ glusterfs-common \
grep \
iproute2 \ iproute2 \
iptables \ iptables \
kmod \ kmod \
@ -84,6 +85,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
qemu-utils \ qemu-utils \
radvd \ radvd \
scrub \ scrub \
sed \
sheepdog \ sheepdog \
systemtap-sdt-dev \ systemtap-sdt-dev \
wireshark-dev \ wireshark-dev \
@ -100,7 +102,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
RUN pip3 install \ RUN pip3 install \
meson==0.54.0 meson==0.55.3
ENV LANG "en_US.UTF-8" ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make" ENV MAKE "/usr/bin/make"

6
ci/containers/ubuntu-2004.Dockerfile
View File

@ -2,7 +2,7 @@
# #
# $ lcitool dockerfile ubuntu-2004 libvirt # $ lcitool dockerfile ubuntu-2004 libvirt
# #
# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a # https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355800d8135ce82
FROM docker.io/library/ubuntu:20.04 FROM docker.io/library/ubuntu:20.04
RUN export DEBIAN_FRONTEND=noninteractive && \ RUN export DEBIAN_FRONTEND=noninteractive && \
@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
gcc \ gcc \
gettext \ gettext \
git \ git \
grep \
iproute2 \ iproute2 \
iptables \ iptables \
kmod \ kmod \
@ -84,6 +85,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
qemu-utils \ qemu-utils \
radvd \ radvd \
scrub \ scrub \
sed \
systemtap-sdt-dev \ systemtap-sdt-dev \
wireshark-dev \ wireshark-dev \
xfslibs-dev \ xfslibs-dev \
@ -99,7 +101,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
RUN pip3 install \ RUN pip3 install \
meson==0.54.0 meson==0.55.3
ENV LANG "en_US.UTF-8" ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make" ENV MAKE "/usr/bin/make"