1
0
mirror of https://gitlab.com/libvirt/libvirt-python.git synced 2025-08-04 12:21:57 +03:00

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>
This commit is contained in:
Daniel P. Berrangé
2020-11-23 18:03:26 +00:00
parent 2110591acf
commit b37f39e4f7
12 changed files with 36 additions and 229 deletions

View File

@ -101,16 +101,16 @@ debian-sid-container:
variables:
NAME: debian-sid
fedora-31-container:
<<: *container_job_definition
variables:
NAME: fedora-31
fedora-32-container:
<<: *container_job_definition
variables:
NAME: fedora-32
fedora-33-container:
<<: *container_job_definition
variables:
NAME: fedora-33
fedora-rawhide-container:
<<: *container_job_definition
variables:
@ -176,13 +176,6 @@ debian-sid-dist-build:
variables:
NAME: debian-sid
fedora-31-dist-build:
<<: *dist_build_job_definition
needs:
- fedora-31-container
variables:
NAME: fedora-31
fedora-32-dist-build:
<<: *dist_build_job_definition
needs:
@ -190,6 +183,13 @@ fedora-32-dist-build:
variables:
NAME: fedora-32
fedora-33-dist-build:
<<: *dist_build_job_definition
needs:
- fedora-33-container
variables:
NAME: fedora-33
fedora-rawhide-dist-build:
<<: *dist_build_job_definition
needs:

View File

@ -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"

View File

@ -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 && \

View File

@ -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"

View File

@ -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"

View File

@ -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 && \

View File

@ -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 && \

View File

@ -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"

View File

@ -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 && \

View File

@ -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"

View File

@ -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"

View File

@ -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"