summaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorJán Tomko <jtomko@redhat.com>2021-04-06 20:27:32 +0200
committerJán Tomko <jtomko@redhat.com>2021-04-06 20:28:14 +0200
commit8e1398f31fac9119d720f860fb0db3fe15435e74 (patch)
treef2291b746a9a837509b42beba55e93164ea01bca /ci
parent5e96c84a37eee936a988454b4337236062c935d7 (diff)
downloadlibvirt-python-8e1398f31fac9119d720f860fb0db3fe15435e74.tar.gz
ci: refresh dockerfiles
Refresh to match libvirt-ci commit 94c25bde639eb31ff2071fb6abfd3d5c777f4ab2 Signed-off-by: Ján Tomko <jtomko@redhat.com>
Diffstat (limited to 'ci')
-rw-r--r--ci/containers/ci-centos-7.Dockerfile5
-rw-r--r--ci/containers/ci-centos-8.Dockerfile5
-rw-r--r--ci/containers/ci-centos-stream.Dockerfile10
-rw-r--r--ci/containers/ci-debian-10.Dockerfile3
-rw-r--r--ci/containers/ci-debian-sid.Dockerfile3
-rw-r--r--ci/containers/ci-fedora-32.Dockerfile3
-rw-r--r--ci/containers/ci-fedora-33.Dockerfile3
-rw-r--r--ci/containers/ci-fedora-rawhide.Dockerfile7
-rw-r--r--ci/containers/ci-ubuntu-1804.Dockerfile3
-rw-r--r--ci/containers/ci-ubuntu-2004.Dockerfile3
10 files changed, 28 insertions, 17 deletions
diff --git a/ci/containers/ci-centos-7.Dockerfile b/ci/containers/ci-centos-7.Dockerfile
index 9e81798..c9f2aa6 100644
--- a/ci/containers/ci-centos-7.Dockerfile
+++ b/ci/containers/ci-centos-7.Dockerfile
@@ -2,8 +2,9 @@
#
# $ lcitool dockerfile centos-7 libvirt+dist,libvirt-python
#
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c437d509e53680
-FROM registry.centos.org/centos:7
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/94c25bde639eb31ff2071fb6abfd3d5c777f4ab2
+
+FROM docker.io/library/centos:7
RUN yum update -y && \
echo 'skip_missing_names_on_install=0' >> /etc/yum.conf && \
diff --git a/ci/containers/ci-centos-8.Dockerfile b/ci/containers/ci-centos-8.Dockerfile
index 5b1b3e3..a79297f 100644
--- a/ci/containers/ci-centos-8.Dockerfile
+++ b/ci/containers/ci-centos-8.Dockerfile
@@ -2,7 +2,8 @@
#
# $ lcitool dockerfile centos-8 libvirt+minimal,libvirt+dist,libvirt-python
#
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c437d509e53680
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/94c25bde639eb31ff2071fb6abfd3d5c777f4ab2
+
FROM docker.io/library/centos:8
RUN dnf update -y && \
@@ -48,7 +49,7 @@ RUN dnf update -y && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
RUN pip3 install \
- meson==0.54.0
+ meson==0.55.3
ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make"
diff --git a/ci/containers/ci-centos-stream.Dockerfile b/ci/containers/ci-centos-stream.Dockerfile
index 905b7d4..89dd018 100644
--- a/ci/containers/ci-centos-stream.Dockerfile
+++ b/ci/containers/ci-centos-stream.Dockerfile
@@ -2,13 +2,15 @@
#
# $ lcitool dockerfile centos-stream libvirt+dist,libvirt-python
#
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c437d509e53680
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/94c25bde639eb31ff2071fb6abfd3d5c777f4ab2
+
FROM docker.io/library/centos:8
-RUN dnf update -y && \
- dnf install -y centos-release-stream && \
+RUN dnf install -y centos-release-stream && \
+ dnf install -y centos-stream-release && \
+ dnf update -y && \
dnf install 'dnf-command(config-manager)' -y && \
- dnf config-manager --set-enabled -y Stream-PowerTools && \
+ dnf config-manager --set-enabled -y powertools && \
dnf install -y centos-release-advanced-virtualization && \
dnf install -y epel-release && \
dnf install -y \
diff --git a/ci/containers/ci-debian-10.Dockerfile b/ci/containers/ci-debian-10.Dockerfile
index 222741c..66e753e 100644
--- a/ci/containers/ci-debian-10.Dockerfile
+++ b/ci/containers/ci-debian-10.Dockerfile
@@ -2,7 +2,8 @@
#
# $ lcitool dockerfile debian-10 libvirt+dist,libvirt-python
#
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c437d509e53680
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/94c25bde639eb31ff2071fb6abfd3d5c777f4ab2
+
FROM docker.io/library/debian:10-slim
RUN export DEBIAN_FRONTEND=noninteractive && \
diff --git a/ci/containers/ci-debian-sid.Dockerfile b/ci/containers/ci-debian-sid.Dockerfile
index 98763d1..b34bc9a 100644
--- a/ci/containers/ci-debian-sid.Dockerfile
+++ b/ci/containers/ci-debian-sid.Dockerfile
@@ -2,7 +2,8 @@
#
# $ lcitool dockerfile debian-sid libvirt+dist,libvirt-python
#
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c437d509e53680
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/94c25bde639eb31ff2071fb6abfd3d5c777f4ab2
+
FROM docker.io/library/debian:sid-slim
RUN export DEBIAN_FRONTEND=noninteractive && \
diff --git a/ci/containers/ci-fedora-32.Dockerfile b/ci/containers/ci-fedora-32.Dockerfile
index bed81fb..1262fb5 100644
--- a/ci/containers/ci-fedora-32.Dockerfile
+++ b/ci/containers/ci-fedora-32.Dockerfile
@@ -2,7 +2,8 @@
#
# $ lcitool dockerfile fedora-32 libvirt+dist,libvirt-python
#
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c437d509e53680
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/94c25bde639eb31ff2071fb6abfd3d5c777f4ab2
+
FROM registry.fedoraproject.org/fedora:32
RUN dnf install -y nosync && \
diff --git a/ci/containers/ci-fedora-33.Dockerfile b/ci/containers/ci-fedora-33.Dockerfile
index 4ff72b1..1aceb22 100644
--- a/ci/containers/ci-fedora-33.Dockerfile
+++ b/ci/containers/ci-fedora-33.Dockerfile
@@ -2,7 +2,8 @@
#
# $ lcitool dockerfile fedora-33 libvirt+dist,libvirt-python
#
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c437d509e53680
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/94c25bde639eb31ff2071fb6abfd3d5c777f4ab2
+
FROM registry.fedoraproject.org/fedora:33
RUN dnf install -y nosync && \
diff --git a/ci/containers/ci-fedora-rawhide.Dockerfile b/ci/containers/ci-fedora-rawhide.Dockerfile
index f285331..88ee141 100644
--- a/ci/containers/ci-fedora-rawhide.Dockerfile
+++ b/ci/containers/ci-fedora-rawhide.Dockerfile
@@ -2,10 +2,12 @@
#
# $ lcitool dockerfile fedora-rawhide libvirt+dist,libvirt-python
#
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c437d509e53680
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/94c25bde639eb31ff2071fb6abfd3d5c777f4ab2
+
FROM registry.fedoraproject.org/fedora:rawhide
-RUN dnf install -y nosync && \
+RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
+ dnf install -y nosync && \
echo -e '#!/bin/sh\n\
if test -d /usr/lib64\n\
then\n\
@@ -15,7 +17,6 @@ else\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 \
diff --git a/ci/containers/ci-ubuntu-1804.Dockerfile b/ci/containers/ci-ubuntu-1804.Dockerfile
index 8e9552e..dedca08 100644
--- a/ci/containers/ci-ubuntu-1804.Dockerfile
+++ b/ci/containers/ci-ubuntu-1804.Dockerfile
@@ -2,7 +2,8 @@
#
# $ lcitool dockerfile ubuntu-1804 libvirt+dist,libvirt-python
#
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c437d509e53680
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/94c25bde639eb31ff2071fb6abfd3d5c777f4ab2
+
FROM docker.io/library/ubuntu:18.04
RUN export DEBIAN_FRONTEND=noninteractive && \
diff --git a/ci/containers/ci-ubuntu-2004.Dockerfile b/ci/containers/ci-ubuntu-2004.Dockerfile
index b02dfd7..79dc23c 100644
--- a/ci/containers/ci-ubuntu-2004.Dockerfile
+++ b/ci/containers/ci-ubuntu-2004.Dockerfile
@@ -2,7 +2,8 @@
#
# $ lcitool dockerfile ubuntu-2004 libvirt+dist,libvirt-python
#
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c437d509e53680
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/94c25bde639eb31ff2071fb6abfd3d5c777f4ab2
+
FROM docker.io/library/ubuntu:20.04
RUN export DEBIAN_FRONTEND=noninteractive && \