diff options
author | Daniel P. Berrangé <berrange@redhat.com> | 2020-11-23 18:03:26 +0000 |
---|---|---|
committer | Daniel P. Berrangé <berrange@redhat.com> | 2020-12-01 16:52:31 +0000 |
commit | b37f39e4f753c7757a8c91bf16cce8557caec496 (patch) | |
tree | 6a2464075d94e0541b563c79795c59e585ad2aae /ci | |
parent | 2110591acfd3a30870f70c2256229e49a4bcd9ee (diff) | |
download | libvirt-python-b37f39e4f753c7757a8c91bf16cce8557caec496.tar.gz |
gitlab: re-generate container images from lcitool
This introduces Fedora 33 and removes some redundant packages.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Diffstat (limited to 'ci')
-rw-r--r-- | ci/containers/libvirt-centos-7.Dockerfile | 22 | ||||
-rw-r--r-- | ci/containers/libvirt-centos-8.Dockerfile | 18 | ||||
-rw-r--r-- | ci/containers/libvirt-centos-stream.Dockerfile | 23 | ||||
-rw-r--r-- | ci/containers/libvirt-debian-10.Dockerfile | 23 | ||||
-rw-r--r-- | ci/containers/libvirt-debian-sid.Dockerfile | 21 | ||||
-rw-r--r-- | ci/containers/libvirt-fedora-32.Dockerfile | 21 | ||||
-rw-r--r-- | ci/containers/libvirt-fedora-33.Dockerfile (renamed from ci/containers/libvirt-fedora-31.Dockerfile) | 23 | ||||
-rw-r--r-- | ci/containers/libvirt-fedora-rawhide.Dockerfile | 21 | ||||
-rw-r--r-- | ci/containers/libvirt-opensuse-151.Dockerfile | 23 | ||||
-rw-r--r-- | ci/containers/libvirt-ubuntu-1804.Dockerfile | 23 | ||||
-rw-r--r-- | ci/containers/libvirt-ubuntu-2004.Dockerfile | 23 |
11 files changed, 24 insertions, 217 deletions
diff --git a/ci/containers/libvirt-centos-7.Dockerfile b/ci/containers/libvirt-centos-7.Dockerfile index 72da1be..4562c4c 100644 --- a/ci/containers/libvirt-centos-7.Dockerfile +++ b/ci/containers/libvirt-centos-7.Dockerfile @@ -1,4 +1,4 @@ -FROM centos:7 +FROM registry.centos.org/centos:7 RUN echo -e '[openvz]\n\ name=OpenVZ addons\n\ @@ -33,26 +33,16 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\ yum install -y epel-release && \ yum update -y && \ yum install -y \ - autoconf \ - automake \ bash \ bash-completion \ ca-certificates \ ccache \ - chrony \ gcc \ - gdb \ gettext \ - gettext-devel \ git \ glibc-common \ glibc-devel \ - libtool \ libvirt-devel \ - lsof \ - make \ - net-tools \ - ninja-build \ patch \ perl \ perl-App-cpanminus \ @@ -64,21 +54,13 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\ python36-devel \ python36-lxml \ python36-nose \ - rpm-build \ - screen \ - strace \ - sudo \ - vim \ - xz && \ + rpm-build && \ yum autoremove -y && \ yum clean all -y && \ 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) -RUN pip3 install \ - meson==0.54.0 - ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/libvirt-centos-8.Dockerfile b/ci/containers/libvirt-centos-8.Dockerfile index 8715f4e..728d975 100644 --- a/ci/containers/libvirt-centos-8.Dockerfile +++ b/ci/containers/libvirt-centos-8.Dockerfile @@ -1,21 +1,17 @@ -FROM centos:8 +FROM registry.centos.org/centos:8 RUN 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 \ - autoconf \ - automake \ bash \ bash-completion \ ca-certificates \ ccache \ - chrony \ gcc \ - gdb \ gettext \ - gettext-devel \ git \ glib2-devel \ glibc-devel \ @@ -23,14 +19,11 @@ RUN dnf install 'dnf-command(config-manager)' -y && \ gnutls-devel \ libnl3-devel \ libtirpc-devel \ - libtool \ libvirt-devel \ libxml2 \ libxml2-devel \ libxslt \ - lsof \ make \ - net-tools \ ninja-build \ patch \ perl \ @@ -45,12 +38,7 @@ RUN dnf install 'dnf-command(config-manager)' -y && \ python3-setuptools \ python3-wheel \ rpcgen \ - rpm-build \ - screen \ - strace \ - sudo \ - vim \ - xz && \ + rpm-build && \ dnf autoremove -y && \ dnf clean all -y && \ mkdir -p /usr/libexec/ccache-wrappers && \ diff --git a/ci/containers/libvirt-centos-stream.Dockerfile b/ci/containers/libvirt-centos-stream.Dockerfile index 6549162..7932149 100644 --- a/ci/containers/libvirt-centos-stream.Dockerfile +++ b/ci/containers/libvirt-centos-stream.Dockerfile @@ -1,31 +1,22 @@ -FROM centos:8 +FROM registry.centos.org/centos:8 RUN 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 \ - autoconf \ - automake \ bash \ bash-completion \ ca-certificates \ ccache \ - chrony \ gcc \ - gdb \ gettext \ - gettext-devel \ git \ glibc-devel \ glibc-langpack-en \ - libtool \ libvirt-devel \ - lsof \ - make \ - net-tools \ - ninja-build \ patch \ perl \ perl-App-cpanminus \ @@ -37,21 +28,13 @@ RUN dnf install -y centos-release-stream && \ python3-pip \ python3-setuptools \ python3-wheel \ - rpm-build \ - screen \ - strace \ - sudo \ - vim \ - xz && \ + rpm-build && \ dnf autoremove -y && \ dnf clean all -y && \ 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) -RUN pip3 install \ - meson==0.54.0 - ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/libvirt-debian-10.Dockerfile b/ci/containers/libvirt-debian-10.Dockerfile index e4c8df1..a66144b 100644 --- a/ci/containers/libvirt-debian-10.Dockerfile +++ b/ci/containers/libvirt-debian-10.Dockerfile @@ -1,31 +1,20 @@ -FROM debian:10 +FROM docker.io/library/debian:10 RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ apt-get dist-upgrade -y && \ apt-get install --no-install-recommends -y \ - autoconf \ - automake \ - autopoint \ bash \ bash-completion \ ca-certificates \ ccache \ - chrony \ cpanminus \ gcc \ - gdb \ gettext \ git \ libc6-dev \ - libtool \ - libtool-bin \ libvirt-dev \ locales \ - lsof \ - make \ - net-tools \ - ninja-build \ patch \ perl \ pkgconf \ @@ -35,12 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ python3-nose \ python3-pip \ python3-setuptools \ - python3-wheel \ - screen \ - strace \ - sudo \ - vim \ - xz-utils && \ + python3-wheel && \ apt-get autoremove -y && \ apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ @@ -49,9 +33,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) -RUN pip3 install \ - meson==0.54.0 - ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/libvirt-debian-sid.Dockerfile b/ci/containers/libvirt-debian-sid.Dockerfile index 726b3f2..6b7f325 100644 --- a/ci/containers/libvirt-debian-sid.Dockerfile +++ b/ci/containers/libvirt-debian-sid.Dockerfile @@ -1,32 +1,20 @@ -FROM debian:sid +FROM docker.io/library/debian:sid RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ apt-get dist-upgrade -y && \ apt-get install --no-install-recommends -y \ - autoconf \ - automake \ - autopoint \ bash \ bash-completion \ ca-certificates \ ccache \ - chrony \ cpanminus \ gcc \ - gdb \ gettext \ git \ libc6-dev \ - libtool \ - libtool-bin \ libvirt-dev \ locales \ - lsof \ - make \ - meson \ - net-tools \ - ninja-build \ patch \ perl \ pkgconf \ @@ -36,12 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ python3-nose \ python3-pip \ python3-setuptools \ - python3-wheel \ - screen \ - strace \ - sudo \ - vim \ - xz-utils && \ + python3-wheel && \ apt-get autoremove -y && \ apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ diff --git a/ci/containers/libvirt-fedora-32.Dockerfile b/ci/containers/libvirt-fedora-32.Dockerfile index 81238ee..63d327d 100644 --- a/ci/containers/libvirt-fedora-32.Dockerfile +++ b/ci/containers/libvirt-fedora-32.Dockerfile @@ -1,29 +1,17 @@ -FROM fedora:32 +FROM registry.fedoraproject.org/fedora:32 RUN dnf update -y && \ dnf install -y \ - autoconf \ - automake \ bash \ bash-completion \ ca-certificates \ ccache \ - chrony \ - cppi \ gcc \ - gdb \ gettext \ - gettext-devel \ git \ glibc-devel \ glibc-langpack-en \ - libtool \ libvirt-devel \ - lsof \ - make \ - meson \ - net-tools \ - ninja-build \ patch \ perl \ perl-App-cpanminus \ @@ -35,12 +23,7 @@ RUN dnf update -y && \ python3-pip \ python3-setuptools \ python3-wheel \ - rpm-build \ - screen \ - strace \ - sudo \ - vim \ - xz && \ + rpm-build && \ dnf autoremove -y && \ dnf clean all -y && \ mkdir -p /usr/libexec/ccache-wrappers && \ diff --git a/ci/containers/libvirt-fedora-31.Dockerfile b/ci/containers/libvirt-fedora-33.Dockerfile index f979a89..321e868 100644 --- a/ci/containers/libvirt-fedora-31.Dockerfile +++ b/ci/containers/libvirt-fedora-33.Dockerfile @@ -1,28 +1,17 @@ -FROM fedora:31 +FROM registry.fedoraproject.org/fedora:33 RUN dnf update -y && \ dnf install -y \ - autoconf \ - automake \ bash \ bash-completion \ ca-certificates \ ccache \ - chrony \ - cppi \ gcc \ - gdb \ gettext \ - gettext-devel \ git \ glibc-devel \ glibc-langpack-en \ - libtool \ libvirt-devel \ - lsof \ - make \ - net-tools \ - ninja-build \ patch \ perl \ perl-App-cpanminus \ @@ -34,21 +23,13 @@ RUN dnf update -y && \ python3-pip \ python3-setuptools \ python3-wheel \ - rpm-build \ - screen \ - strace \ - sudo \ - vim \ - xz && \ + rpm-build && \ dnf autoremove -y && \ dnf clean all -y && \ 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) -RUN pip3 install \ - meson==0.54.0 - ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/libvirt-fedora-rawhide.Dockerfile b/ci/containers/libvirt-fedora-rawhide.Dockerfile index 8a5f39c..955e0f1 100644 --- a/ci/containers/libvirt-fedora-rawhide.Dockerfile +++ b/ci/containers/libvirt-fedora-rawhide.Dockerfile @@ -1,30 +1,18 @@ -FROM fedora:rawhide +FROM registry.fedoraproject.org/fedora:rawhide RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ dnf update -y && \ dnf install -y \ - autoconf \ - automake \ bash \ bash-completion \ ca-certificates \ ccache \ - chrony \ - cppi \ gcc \ - gdb \ gettext \ - gettext-devel \ git \ glibc-devel \ glibc-langpack-en \ - libtool \ libvirt-devel \ - lsof \ - make \ - meson \ - net-tools \ - ninja-build \ patch \ perl \ perl-App-cpanminus \ @@ -36,12 +24,7 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ python3-pip \ python3-setuptools \ python3-wheel \ - rpm-build \ - screen \ - strace \ - sudo \ - vim \ - xz && \ + rpm-build && \ dnf autoremove -y && \ dnf clean all -y && \ mkdir -p /usr/libexec/ccache-wrappers && \ diff --git a/ci/containers/libvirt-opensuse-151.Dockerfile b/ci/containers/libvirt-opensuse-151.Dockerfile index c1509a3..fb5d652 100644 --- a/ci/containers/libvirt-opensuse-151.Dockerfile +++ b/ci/containers/libvirt-opensuse-151.Dockerfile @@ -1,28 +1,17 @@ -FROM opensuse/leap:15.1 +FROM registry.opensuse.org/opensuse/leap:15.1 RUN zypper update -y && \ zypper install -y \ - autoconf \ - automake \ bash \ bash-completion \ ca-certificates \ ccache \ - chrony \ - cppi \ gcc \ - gdb \ gettext \ - gettext-devel \ git \ glibc-devel \ glibc-locale \ - libtool \ libvirt-devel \ - lsof \ - make \ - net-tools \ - ninja \ patch \ perl \ perl-App-cpanminus \ @@ -34,20 +23,12 @@ RUN zypper update -y && \ python3-pip \ python3-setuptools \ python3-wheel \ - rpm-build \ - screen \ - strace \ - sudo \ - vim \ - xz && \ + rpm-build && \ zypper clean --all && \ 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) -RUN pip3 install \ - meson==0.54.0 - ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/libvirt-ubuntu-1804.Dockerfile b/ci/containers/libvirt-ubuntu-1804.Dockerfile index 4e3e5b5..1a39f3e 100644 --- a/ci/containers/libvirt-ubuntu-1804.Dockerfile +++ b/ci/containers/libvirt-ubuntu-1804.Dockerfile @@ -1,31 +1,20 @@ -FROM ubuntu:18.04 +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 \ - autoconf \ - automake \ - autopoint \ bash \ bash-completion \ ca-certificates \ ccache \ - chrony \ cpanminus \ gcc \ - gdb \ gettext \ git \ libc6-dev \ - libtool \ - libtool-bin \ libvirt-dev \ locales \ - lsof \ - make \ - net-tools \ - ninja-build \ patch \ perl \ pkgconf \ @@ -35,12 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ python3-nose \ python3-pip \ python3-setuptools \ - python3-wheel \ - screen \ - strace \ - sudo \ - vim \ - xz-utils && \ + python3-wheel && \ apt-get autoremove -y && \ apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ @@ -49,9 +33,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) -RUN pip3 install \ - meson==0.54.0 - ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/libvirt-ubuntu-2004.Dockerfile b/ci/containers/libvirt-ubuntu-2004.Dockerfile index eb63edc..124bf77 100644 --- a/ci/containers/libvirt-ubuntu-2004.Dockerfile +++ b/ci/containers/libvirt-ubuntu-2004.Dockerfile @@ -1,31 +1,20 @@ -FROM ubuntu:20.04 +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 \ - autoconf \ - automake \ - autopoint \ bash \ bash-completion \ ca-certificates \ ccache \ - chrony \ cpanminus \ gcc \ - gdb \ gettext \ git \ libc6-dev \ - libtool \ - libtool-bin \ libvirt-dev \ locales \ - lsof \ - make \ - net-tools \ - ninja-build \ patch \ perl \ pkgconf \ @@ -35,12 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ python3-nose \ python3-pip \ python3-setuptools \ - python3-wheel \ - screen \ - strace \ - sudo \ - vim \ - xz-utils && \ + python3-wheel && \ apt-get autoremove -y && \ apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ @@ -49,9 +33,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) -RUN pip3 install \ - meson==0.54.0 - ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" |