From: "Daniel P. Berrangé" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Fam Zheng" <fam@euphon.net>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Peter Maydell" <peter.maydell@linaro.org>
Subject: [PATCH 19/23] tests/docker: auto-generate centos8 with lcitool
Date: Tue, 1 Dec 2020 17:18:21 +0000 [thread overview]
Message-ID: <20201201171825.2243775-20-berrange@redhat.com> (raw)
In-Reply-To: <20201201171825.2243775-1-berrange@redhat.com>
This commit is best examined using the "-b" option to diff.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
tests/docker/dockerfiles/centos7.docker | 2 +-
tests/docker/dockerfiles/centos8.docker | 216 +++++++++++++-----------
tests/docker/dockerfiles/refresh | 1 +
3 files changed, 120 insertions(+), 99 deletions(-)
diff --git a/tests/docker/dockerfiles/centos7.docker b/tests/docker/dockerfiles/centos7.docker
index 2bdb268076..97e06bbc65 100644
--- a/tests/docker/dockerfiles/centos7.docker
+++ b/tests/docker/dockerfiles/centos7.docker
@@ -2,7 +2,7 @@
#
# $ lcitool dockerfile centos-7 qemu
#
-# https://gitlab.com/berrange/libvirt-ci/-/commit/5ae4c04258978fae40be7113ac33587d71fe3c4f
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/5ae4c04258978fae40be7113ac33587d71fe3c4f
FROM registry.centos.org/centos:7
diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker
index 96b231ee18..7c8b2194ff 100644
--- a/tests/docker/dockerfiles/centos8.docker
+++ b/tests/docker/dockerfiles/centos8.docker
@@ -1,101 +1,121 @@
+# THIS FILE IS AUTO-GENERATED
+#
+# $ lcitool dockerfile centos-8 qemu
+#
+# https://gitlab.com/berrange/libvirt-ci/-/commit/5ae4c04258978fae40be7113ac33587d71fe3c4f
+
FROM registry.centos.org/centos:8
-RUN dnf -y update
-ENV PACKAGES \
- SDL2-devel \
- alsa-lib-devel \
- bc \
- brlapi-devel \
- bzip2 \
- bzip2-devel \
- ca-certificates \
- capstone-devel \
- ccache \
- clang \
- cyrus-sasl-devel \
- daxctl-devel \
- dbus-daemon \
- device-mapper-multipath-devel \
- diffutils \
- findutils \
- gcc \
- gcc-c++ \
- genisoimage \
- gettext \
- git \
- glib2-devel \
- glibc-langpack-en \
- glusterfs-api-devel \
- gnutls-devel \
- gtk3-devel \
- hostname \
- libaio-devel \
- libasan \
- libattr-devel \
- libcacard-devel \
- libcap-ng-devel \
- libcurl-devel \
- libdrm-devel \
- libepoxy-devel \
- libfdt-devel \
- libgcrypt-devel \
- libiscsi-devel \
- libjpeg-devel \
- libnfs-devel \
- libpmem-devel \
- libpng-devel \
- librbd-devel \
- libseccomp-devel \
- libslirp-devel \
- libssh-devel \
- libtasn1-devel \
- libubsan \
- libudev-devel \
- libusbx-devel \
- libxml2-devel \
- libzstd-devel \
- lzo-devel \
- make \
- mesa-libgbm-devel \
- ncurses-devel \
- nettle-devel \
- ninja-build \
- nmap-ncat \
- numactl-devel \
- openssh-clients \
- pam-devel \
- perl \
- perl-Test-Harness \
- pixman-devel \
- pkgconfig \
- pulseaudio-libs-devel \
- python3 \
- python3-PyYAML \
- python3-numpy \
- python3-pillow \
- python3-pip \
- python3-setuptools \
- python3-sphinx \
- python3-virtualenv \
- python3-wheel \
- rdma-core-devel \
- rpm \
- snappy-devel \
- spice-protocol \
- spice-server-devel \
- systemd-devel \
- systemtap-sdt-devel \
- tar \
- texinfo \
- usbredir-devel \
- vim-minimal \
- virglrenderer-devel \
- vte291-devel \
- which \
- xfsprogs-devel \
- zlib-devel
+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 \
+ SDL2-devel \
+ alsa-lib-devel \
+ bc \
+ brlapi-devel \
+ bzip2 \
+ bzip2-devel \
+ ca-certificates \
+ capstone-devel \
+ ccache \
+ clang \
+ cyrus-sasl-devel \
+ daxctl-devel \
+ dbus-daemon \
+ device-mapper-multipath-devel \
+ diffutils \
+ findutils \
+ gcc \
+ gcc-c++ \
+ genisoimage \
+ gettext \
+ git \
+ glib2-devel \
+ glibc-langpack-en \
+ glusterfs-api-devel \
+ gnutls-devel \
+ gtk3-devel \
+ hostname \
+ libaio-devel \
+ libasan \
+ libattr-devel \
+ libcacard-devel \
+ libcap-ng-devel \
+ libcurl-devel \
+ libdrm-devel \
+ libepoxy-devel \
+ libfdt-devel \
+ libgcrypt-devel \
+ libiscsi-devel \
+ libjpeg-devel \
+ libnfs-devel \
+ libpmem-devel \
+ libpng-devel \
+ librbd-devel \
+ libseccomp-devel \
+ libslirp-devel \
+ libssh-devel \
+ libtasn1-devel \
+ libubsan \
+ libudev-devel \
+ libusbx-devel \
+ libxml2-devel \
+ libzstd-devel \
+ lzo-devel \
+ make \
+ mesa-libgbm-devel \
+ ncurses-devel \
+ nettle-devel \
+ ninja-build \
+ nmap-ncat \
+ numactl-devel \
+ openssh-clients \
+ pam-devel \
+ perl \
+ perl-Test-Harness \
+ pixman-devel \
+ pkgconfig \
+ pulseaudio-libs-devel \
+ python3 \
+ python3-PyYAML \
+ python3-numpy \
+ python3-pillow \
+ python3-pip \
+ python3-setuptools \
+ python3-sphinx \
+ python3-virtualenv \
+ python3-wheel \
+ rdma-core-devel \
+ rpm \
+ snappy-devel \
+ spice-protocol \
+ spice-server-devel \
+ systemd-devel \
+ systemtap-sdt-devel \
+ tar \
+ texinfo \
+ usbredir-devel \
+ vim-minimal \
+ virglrenderer-devel \
+ vte291-devel \
+ which \
+ xfsprogs-devel \
+ zlib-devel && \
+ 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)
+
+RUN pip3 install \
+ meson==0.54.0
-RUN dnf install -y dnf-plugins-core && \
- dnf config-manager --set-enabled PowerTools && \
- dnf install -y $PACKAGES
-RUN rpm -q $PACKAGES | sort > /packages.txt
+ENV LANG "en_US.UTF-8"
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/tests/docker/dockerfiles/refresh b/tests/docker/dockerfiles/refresh
index a6f0adee81..90030117b0 100755
--- a/tests/docker/dockerfiles/refresh
+++ b/tests/docker/dockerfiles/refresh
@@ -49,5 +49,6 @@ def generate_image(filename, host, cross=None, trailer=None):
try:
generate_image("centos7.docker", "centos-7")
+ generate_image("centos8.docker", "centos-8")
except Exception as ex:
print(str(ex), file=sys.stderr)
--
2.28.0
next prev parent reply other threads:[~2020-12-01 17:41 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-01 17:18 [PATCH 00/23] tests/docker: start using libvirt-ci's "lcitool" for dockerfiles Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 01/23] hw/usb/ccid: remove references to NSS Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 02/23] tests/docker: don't use BUILDKIT in GitLab either Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 03/23] tests/docker: use project specific container registries Daniel P. Berrangé
2020-12-02 11:54 ` Gerd Hoffmann
2020-12-02 12:03 ` Daniel P. Berrangé
2021-01-13 21:17 ` Wainer dos Santos Moschetta
2020-12-01 17:18 ` [PATCH 04/23] tests/docker: use explicit docker.io registry Daniel P. Berrangé
2020-12-01 17:34 ` Philippe Mathieu-Daudé
2021-01-13 21:22 ` Wainer dos Santos Moschetta
2020-12-01 17:18 ` [PATCH 05/23] tests/docker: remove travis container Daniel P. Berrangé
2020-12-02 12:08 ` Thomas Huth
2021-01-13 21:26 ` Wainer dos Santos Moschetta
2020-12-01 17:18 ` [PATCH 06/23] tests/docker: remove FEATURES env var from templates Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 07/23] tests/docker: fix sorting in package lists Daniel P. Berrangé
2020-12-01 17:35 ` Philippe Mathieu-Daudé
2020-12-01 17:18 ` [PATCH 08/23] tests/docker: fix mistakes in centos " Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 09/23] tests/docker: fix mistakes in fedora package list Daniel P. Berrangé
2020-12-01 17:36 ` Philippe Mathieu-Daudé
2020-12-01 17:18 ` [PATCH 10/23] tests/docker: fix mistakes in ubuntu package lists Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 11/23] tests/docker: remove mingw packages from Fedora Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 12/23] tests/docker: add script for automating container refresh Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 13/23] tests/docker: expand centos7 package list Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 14/23] tests/docker: expand centos8 " Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 15/23] tests/docker: expand fedora " Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 16/23] tests/docker: expand ubuntu1804 " Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 17/23] tests/docker: expand ubuntu2004 " Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 18/23] tests/docker: auto-generate centos7 with lcitool Daniel P. Berrangé
2020-12-02 12:07 ` Gerd Hoffmann
2020-12-04 13:37 ` Daniel P. Berrangé
2020-12-01 17:18 ` Daniel P. Berrangé [this message]
2020-12-01 17:18 ` [PATCH 20/23] tests/docker: auto-generate fedora " Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 21/23] tests/docker: auto-generate ubuntu1804 " Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 22/23] tests/docker: auto-generate ubuntu2004 " Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 23/23] tests/docker: remove ubuntu container Daniel P. Berrangé
2020-12-01 17:53 ` [PATCH 00/23] tests/docker: start using libvirt-ci's "lcitool" for dockerfiles Kashyap Chamarthy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201201171825.2243775-20-berrange@redhat.com \
--to=berrange@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=fam@euphon.net \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.