summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ci/containers/ci-centos-7.Dockerfile39
-rw-r--r--ci/containers/ci-centos-8.Dockerfile14
-rw-r--r--ci/containers/ci-centos-stream.Dockerfile12
-rw-r--r--ci/containers/ci-debian-10.Dockerfile17
-rw-r--r--ci/containers/ci-debian-sid.Dockerfile17
-rw-r--r--ci/containers/ci-fedora-32.Dockerfile24
-rw-r--r--ci/containers/ci-fedora-33.Dockerfile24
-rw-r--r--ci/containers/ci-fedora-rawhide.Dockerfile26
-rw-r--r--ci/containers/ci-opensuse-151.Dockerfile6
-rw-r--r--ci/containers/ci-ubuntu-1804.Dockerfile15
-rw-r--r--ci/containers/ci-ubuntu-2004.Dockerfile15
11 files changed, 140 insertions, 69 deletions
diff --git a/ci/containers/ci-centos-7.Dockerfile b/ci/containers/ci-centos-7.Dockerfile
index 0aac9c0..9e81798 100644
--- a/ci/containers/ci-centos-7.Dockerfile
+++ b/ci/containers/ci-centos-7.Dockerfile
@@ -1,37 +1,13 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool dockerfile centos-7 libvirt+dist,libvirt-python
+#
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c437d509e53680
FROM registry.centos.org/centos:7
-RUN echo -e '[openvz]\n\
-name=OpenVZ addons\n\
-baseurl=https://download.openvz.org/virtuozzo/releases/openvz-7.0.11-235/x86_64/os/\n\
-enabled=1\n\
-gpgcheck=1\n\
-skip_if_unavailable=0\n\
-metadata_expire=6h\n\
-priority=90\n\
-includepkgs=libprl*' > /etc/yum.repos.d/openvz.repo && \
- echo -e '-----BEGIN PGP PUBLIC KEY BLOCK-----\n\
-Version: GnuPG v2.0.22 (GNU/Linux)\n\
-\n\
-mI0EVl80nQEEAKrEeyeTCwrzS9kYedZ/sAc/GUqlb81C7pA9SaR3fyck5mVw1Ogk\n\
-YdmNBPM2kY7QDxR9F0EpSpnxSCAXZXugsQ8KzZ0DRLVeBDQyGs9IGK5hI0zzxIil\n\
-BzfvIexLiQQhLy7YlIi8Jt/uUqKkW0pIMNMGcduY97VATtczpncpkmSzABEBAAG0\n\
-SFZpcnR1b3p6byBUZWFtIChHUEcga2V5IHNpZ25hdHVyZSBmb3IgcGFja2FnZXMp\n\
-IDxzZWN1cml0eUB2aXJ0dW96em8uY29tPoi5BBMBAgAjBQJWXzSdAhsDBwsJCAcD\n\
-AgEGFQgCCQoLBBYCAwECHgECF4AACgkQygt9GUTNrSruIgP/er70Eyo73A1gfrjv\n\
-oPUkyo4rslVRZu3qqCwoMFtJc/Z/UxWgEka1buorlcGLa6eO/EZ49c0n+KGa4Kvt\n\
-EUboIq0yEu5i0FyAj92ifm+hNhoAbGfm0cZ4/fD0oGr3l8OsQo4+iHX4xAPwFe7Y\n\
-zABuB8I1ZDZ4OIp5tDfTTuF2LT24jQRWXzSdAQQAog2Aqb+Ptl68O7cQhWLjVGkj\n\
-yyigZrdeReLx3HloKJPBeQ/kA6uvMJc/IYS3uppMWXv9v+QenS6uhP1TUJ2k9FvM\n\
-t94MQZfALN7Vpf8AF+UeWu4Ru+y4BNzcFhrPhIFNFChOR2QqW6FkgE57D9I177NC\n\
-oJMyrlNe8wcGa178An8AEQEAAYifBBgBAgAJBQJWXzSdAhsMAAoJEMoLfRlEza0q\n\
-bKwD/3+OFVIEXnIv5XgdGRNX5fHggsUN1bb8gva7HANRlKdd4LD8foDM3F/yv/3V\n\
-igG14D5EjKz56SaBDNgiI4++hOzb2M8jhAsR86jxkXFrrP1U3ZNRKg6av9DPFAPS\n\
-WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\
-=fRMg\n\
------END PGP PUBLIC KEY BLOCK-----' > /etc/pki/rpm-gpg/RPM-GPG-KEY-OpenVZ && \
- rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-OpenVZ && \
+RUN yum update -y && \
+ echo 'skip_missing_names_on_install=0' >> /etc/yum.conf && \
yum install -y epel-release && \
- yum update -y && \
yum install -y \
ca-certificates \
ccache \
@@ -48,6 +24,7 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\
rpm-build && \
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 03bd8f1..5b1b3e3 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+minimal,libvirt+dist,libvirt-python
+#
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c437d509e53680
+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 \
ca-certificates \
ccache \
@@ -37,6 +42,7 @@ RUN dnf install 'dnf-command(config-manager)' -y && \
rpm-build && \
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 5579f90..905b7d4 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+dist,libvirt-python
+#
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c437d509e53680
+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 \
ca-certificates \
ccache \
@@ -22,6 +27,7 @@ RUN dnf install -y centos-release-stream && \
rpm-build && \
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.Dockerfile b/ci/containers/ci-debian-10.Dockerfile
index 4ad857d..222741c 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+dist,libvirt-python
+#
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c437d509e53680
+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 \
ca-certificates \
ccache \
gcc \
@@ -16,10 +22,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-lxml \
python3-nose \
python3-setuptools && \
- 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.Dockerfile b/ci/containers/ci-debian-sid.Dockerfile
index a261e33..98763d1 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+dist,libvirt-python
+#
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c437d509e53680
+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 \
ca-certificates \
ccache \
gcc \
@@ -16,10 +22,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-lxml \
python3-nose \
python3-setuptools && \
- 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 4bf5e0a..bed81fb 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+dist,libvirt-python
+#
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c437d509e53680
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 \
ca-certificates \
ccache \
gcc \
@@ -15,8 +30,9 @@ RUN dnf update -y && \
python3-nose \
python3-setuptools \
rpm-build && \
- 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 fe6e4b1..4ff72b1 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+dist,libvirt-python
+#
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c437d509e53680
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 \
ca-certificates \
ccache \
gcc \
@@ -15,8 +30,9 @@ RUN dnf update -y && \
python3-nose \
python3-setuptools \
rpm-build && \
- 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.Dockerfile b/ci/containers/ci-fedora-rawhide.Dockerfile
index 66deb87..f285331 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+dist,libvirt-python
+#
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c437d509e53680
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 \
ca-certificates \
ccache \
gcc \
@@ -16,8 +31,9 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
python3-nose \
python3-setuptools \
rpm-build && \
- 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 ff52c92..2d82f24 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+dist,libvirt-python
+#
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c437d509e53680
FROM registry.opensuse.org/opensuse/leap:15.1
RUN zypper update -y && \
@@ -16,6 +21,7 @@ RUN zypper update -y && \
python3-setuptools \
rpm-build && \
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 ff19cdb..8e9552e 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+dist,libvirt-python
+#
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c437d509e53680
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 \
ca-certificates \
ccache \
gcc \
@@ -16,10 +22,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-lxml \
python3-nose \
python3-setuptools && \
- 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 4be1a01..b02dfd7 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+dist,libvirt-python
+#
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c437d509e53680
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 \
ca-certificates \
ccache \
gcc \
@@ -16,10 +22,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-lxml \
python3-nose \
python3-setuptools && \
- 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)
View Lorry Controller Status