shaba/virt-viewer
1
0
Fork 0
mirror of https://gitlab.com/virt-viewer/virt-viewer.git synced 2025-03-24 06:50:10 +03:00
Code Issues Projects Releases Wiki Activity

gitlab: re-generate container images from lcitool

Browse Source 
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:40 +00:00
parent 3d3f0fbe26
commit ab84b11b2d
14 changed files with 41 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.gitlab-ci.yml
View File

@ -140,16 +140,16 @@ x86-debian-sid-container:
variables:
NAME: debian-sid
x86-fedora-31-container:
<<: *container_job_definition
variables:
NAME: fedora-31
x86-fedora-32-container:
<<: *container_job_definition
variables:
NAME: fedora-32
x86-fedora-33-container:
<<: *container_job_definition
variables:
NAME: fedora-33
x86-fedora-rawhide-container:
<<: *container_job_definition
variables:
@ -208,16 +208,16 @@ x86-debian-sid-dist-build:
variables:
NAME: debian-sid
x86-fedora-31-dist-build:
<<: *dist_native_build_job_definition
variables:
NAME: fedora-31
x86-fedora-32-dist-build:
<<: *dist_native_build_job_definition
variables:
NAME: fedora-32
x86-fedora-33-dist-build:
<<: *dist_native_build_job_definition
variables:
NAME: fedora-33
x86-fedora-rawhide-dist-build:
<<: *dist_native_build_job_definition
variables:

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

@ -1,4 +1,4 @@
FROM centos:7
FROM registry.centos.org/centos:7
RUN echo -e '[openvz]\n\
name=OpenVZ addons\n\
@ -39,9 +39,7 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\
bash-completion \
ca-certificates \
ccache \
chrony \
gcc \
gdb \
gettext \
gettext-devel \
git \
@ -57,10 +55,7 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\
libvirt-gobject-devel \
libxml2 \
libxml2-devel \
lsof \
make \
net-tools \
ninja-build \
patch \
perl \
perl-App-cpanminus \
@ -71,21 +66,13 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\
python3-wheel \
rest-devel \
rpm-build \
screen \
spice-gtk3-devel \
strace \
sudo \
vim \
xz && \
spice-gtk3-devel && \
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"

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

@ -1,7 +1,8 @@
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 \
@ -11,10 +12,8 @@ RUN dnf install 'dnf-command(config-manager)' -y && \
bash-completion \
ca-certificates \
ccache \
chrony \
cyrus-sasl-devel \
gcc \
gdb \
gdk-pixbuf2-devel \
gettext \
gettext-devel \
@ -35,9 +34,7 @@ RUN dnf install 'dnf-command(config-manager)' -y && \
libxml2 \
libxml2-devel \
libxslt \
lsof \
make \
net-tools \
ninja-build \
patch \
perl \
@ -51,13 +48,8 @@ RUN dnf install 'dnf-command(config-manager)' -y && \
python3-wheel \
rpcgen \
rpm-build \
screen \
spice-gtk3-devel \
strace \
sudo \
vala \
vim \
xz && \
vala && \
dnf autoremove -y && \
dnf clean all -y && \
mkdir -p /usr/libexec/ccache-wrappers && \

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

@ -1,8 +1,9 @@
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 \
@ -12,10 +13,8 @@ RUN dnf install -y centos-release-stream && \
bash-completion \
ca-certificates \
ccache \
chrony \
cyrus-sasl-devel \
gcc \
gdb \
gdk-pixbuf2-devel \
gettext \
gettext-devel \
@ -36,9 +35,7 @@ RUN dnf install -y centos-release-stream && \
libxml2 \
libxml2-devel \
libxslt \
lsof \
make \
net-tools \
ninja-build \
patch \
perl \
@ -52,13 +49,8 @@ RUN dnf install -y centos-release-stream && \
python3-wheel \
rpcgen \
rpm-build \
screen \
spice-gtk3-devel \
strace \
sudo \
vala \
vim \
xz && \
vala && \
dnf autoremove -y && \
dnf clean all -y && \
mkdir -p /usr/libexec/ccache-wrappers && \

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

@ -1,4 +1,4 @@
FROM debian:10
FROM docker.io/library/debian:10
RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
@ -11,10 +11,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
bash-completion \
ca-certificates \
ccache \
chrony \
cpanminus \
gcc \
gdb \
gettext \
git \
icoutils \
@ -32,22 +30,14 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libxml2-dev \
libxml2-utils \
locales \
lsof \
make \
net-tools \
ninja-build \
patch \
perl \
pkgconf \
python3 \
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 && \
@ -56,9 +46,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"

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

@ -1,4 +1,4 @@
FROM debian:sid
FROM docker.io/library/debian:sid
RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
@ -11,10 +11,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
bash-completion \
ca-certificates \
ccache \
chrony \
cpanminus \
gcc \
gdb \
gettext \
git \
icoutils \
@ -32,23 +30,14 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libxml2-dev \
libxml2-utils \
locales \
lsof \
make \
meson \
net-tools \
ninja-build \
patch \
perl \
pkgconf \
python3 \
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 && \

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

@ -1,4 +1,4 @@
FROM fedora:32
FROM registry.fedoraproject.org/fedora:32
RUN dnf update -y && \
dnf install -y \
@ -8,10 +8,7 @@ RUN dnf update -y && \
bash-completion \
ca-certificates \
ccache \
chrony \
cppi \
gcc \
gdb \
gettext \
gettext-devel \
git \
@ -27,11 +24,7 @@ RUN dnf update -y && \
libvirt-gobject-devel \
libxml2 \
libxml2-devel \
lsof \
make \
meson \
net-tools \
ninja-build \
patch \
perl \
perl-App-cpanminus \
@ -42,12 +35,7 @@ RUN dnf update -y && \
python3-wheel \
rest-devel \
rpm-build \
screen \
spice-gtk3-devel \
strace \
sudo \
vim \
xz && \
spice-gtk3-devel && \
dnf autoremove -y && \
dnf clean all -y && \
mkdir -p /usr/libexec/ccache-wrappers && \

18
ci/containers/fedora-31.Dockerfile → ci/containers/fedora-33.Dockerfile
View File

@ -1,4 +1,4 @@
FROM fedora:31
FROM fedora:33
RUN dnf update -y && \
dnf install -y \
@ -8,10 +8,7 @@ RUN dnf update -y && \
bash-completion \
ca-certificates \
ccache \
chrony \
cppi \
gcc \
gdb \
gettext \
gettext-devel \
git \
@ -27,10 +24,7 @@ RUN dnf update -y && \
libvirt-gobject-devel \
libxml2 \
libxml2-devel \
lsof \
make \
net-tools \
ninja-build \
patch \
perl \
perl-App-cpanminus \
@ -41,21 +35,13 @@ RUN dnf update -y && \
python3-wheel \
rest-devel \
rpm-build \
screen \
spice-gtk3-devel \
strace \
sudo \
vim \
xz && \
spice-gtk3-devel && \
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"

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

@ -1,6 +1,6 @@
FROM fedora:rawhide
FROM registry.fedoraproject.org/fedora:rawhide
RUN dnf update -y --nogpgcheck fedora-gpg-keys fedora-release-container && \
RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
dnf update -y && \
dnf install -y \
augeas \
@ -10,14 +10,13 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys fedora-release-container && \
bash-completion \
ca-certificates \
ccache \
chrony \
clang \
cppi \
dnsmasq \
dwarves \
ebtables \
firewalld-filesystem \
gcc \
gdb \
gettext-devel \
git \
glibc-langpack-en \
@ -32,11 +31,9 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys fedora-release-container && \
libwsman-devel \
libxml2 \
libxslt \
lsof \
lvm2 \
make \
meson \
net-tools \
nfs-utils \
ninja-build \
numad \
@ -55,14 +52,9 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys fedora-release-container && \
radvd \
rpcgen \
rpm-build \
screen \
scrub \
sheepdog \
strace \
sudo \
vala \
vim \
xz \
zfs-fuse && \
dnf autoremove -y && \
dnf clean all -y && \

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

@ -1,6 +1,6 @@
FROM fedora:rawhide
FROM registry.fedoraproject.org/fedora:rawhide
RUN dnf update -y --nogpgcheck fedora-gpg-keys fedora-release-container && \
RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
dnf update -y && \
dnf install -y \
augeas \
@ -10,14 +10,13 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys fedora-release-container && \
bash-completion \
ca-certificates \
ccache \
chrony \
clang \
cppi \
dnsmasq \
dwarves \
ebtables \
firewalld-filesystem \
gcc \
gdb \
gettext-devel \
git \
glibc-langpack-en \
@ -32,11 +31,9 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys fedora-release-container && \
libwsman-devel \
libxml2 \
libxslt \
lsof \
lvm2 \
make \
meson \
net-tools \
nfs-utils \
ninja-build \
numad \
@ -55,14 +52,9 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys fedora-release-container && \
radvd \
rpcgen \
rpm-build \
screen \
scrub \
sheepdog \
strace \
sudo \
vala \
vim \
xz \
zfs-fuse && \
dnf autoremove -y && \
dnf clean all -y && \

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

@ -1,6 +1,6 @@
FROM fedora:rawhide
FROM registry.fedoraproject.org/fedora:rawhide
RUN dnf update -y --nogpgcheck fedora-gpg-keys fedora-release-container && \
RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
dnf update -y && \
dnf install -y \
autoconf \
@ -9,10 +9,7 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys fedora-release-container && \
bash-completion \
ca-certificates \
ccache \
chrony \
cppi \
gcc \
gdb \
gettext \
gettext-devel \
git \
@ -28,11 +25,7 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys fedora-release-container && \
libvirt-gobject-devel \
libxml2 \
libxml2-devel \
lsof \
make \
meson \
net-tools \
ninja-build \
patch \
perl \
perl-App-cpanminus \
@ -43,12 +36,7 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys fedora-release-container && \
python3-wheel \
rest-devel \
rpm-build \
screen \
spice-gtk3-devel \
strace \
sudo \
vim \
xz && \
spice-gtk3-devel && \
dnf autoremove -y && \
dnf clean all -y && \
mkdir -p /usr/libexec/ccache-wrappers && \

18
ci/containers/opensuse-151.Dockerfile
View File

@ -1,4 +1,4 @@
FROM opensuse/leap:15.1
FROM registry.opensuse.org/opensuse/leap:15.1
RUN zypper update -y && \
zypper install -y \
@ -8,10 +8,7 @@ RUN zypper update -y && \
bash-completion \
ca-certificates \
ccache \
chrony \
cppi \
gcc \
gdb \
gettext \
gettext-devel \
git \
@ -28,10 +25,7 @@ RUN zypper update -y && \
libvirt-glib-devel \
libxml2 \
libxml2-devel \
lsof \
make \
net-tools \
ninja \
patch \
perl \
perl-App-cpanminus \
@ -41,20 +35,12 @@ RUN zypper update -y && \
python3-setuptools \
python3-wheel \
rpm-build \
screen \
spice-gtk-devel \
strace \
sudo \
vim \
xz && \
spice-gtk-devel && \
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"

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

@ -1,4 +1,4 @@
FROM ubuntu:18.04
FROM docker.io/library/ubuntu:18.04
RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
@ -11,10 +11,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
bash-completion \
ca-certificates \
ccache \
chrony \
cpanminus \
gcc \
gdb \
gettext \
git \
icoutils \
@ -31,22 +29,14 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libxml2-dev \
libxml2-utils \
locales \
lsof \
make \
net-tools \
ninja-build \
patch \
perl \
pkgconf \
python3 \
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 && \
@ -55,9 +45,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"

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

@ -1,4 +1,4 @@
FROM ubuntu:20.04
FROM docker.io/library/ubuntu:20.04
RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
@ -11,10 +11,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
bash-completion \
ca-certificates \
ccache \
chrony \
cpanminus \
gcc \
gdb \
gettext \
git \
icoutils \
@ -31,22 +29,14 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libxml2-dev \
libxml2-utils \
locales \
lsof \
make \
net-tools \
ninja-build \
patch \
perl \
pkgconf \
python3 \
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 && \
@ -55,9 +45,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"