From: "Daniel P. Berrangé" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Fam Zheng" <fam@euphon.net>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PATCH v2 22/25] tests/docker: auto-generate ubuntu1804 with lcitool
Date: Thu, 14 Jan 2021 13:02:42 +0000 [thread overview]
Message-ID: <20210114130245.1654081-23-berrange@redhat.com> (raw)
In-Reply-To: <20210114130245.1654081-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/refresh | 6 +
tests/docker/dockerfiles/ubuntu1804.docker | 235 +++++++++++----------
2 files changed, 135 insertions(+), 106 deletions(-)
diff --git a/tests/docker/dockerfiles/refresh b/tests/docker/dockerfiles/refresh
index bc7d8dd5f0..ab1d00fcf8 100755
--- a/tests/docker/dockerfiles/refresh
+++ b/tests/docker/dockerfiles/refresh
@@ -51,5 +51,11 @@ try:
generate_image("centos7.docker", "centos-7")
generate_image("centos8.docker", "centos-8")
generate_image("fedora.docker", "fedora-32")
+
+ skipssh = ["# https://bugs.launchpad.net/qemu/+bug/1838763\n",
+ "ENV QEMU_CONFIGURE_OPTS --disable-libssh\n"]
+
+ generate_image("ubuntu1804.docker", "ubuntu-1804",
+ trailer="".join(skipssh))
except Exception as ex:
print(str(ex), file=sys.stderr)
diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/ubuntu1804.docker
index 5bfb90ca72..e7dc319001 100644
--- a/tests/docker/dockerfiles/ubuntu1804.docker
+++ b/tests/docker/dockerfiles/ubuntu1804.docker
@@ -1,110 +1,133 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool dockerfile ubuntu-1804 qemu
+#
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/945dce80da3ebde4033bcf2bd4763ea472118fc9
FROM docker.io/library/ubuntu:18.04
-ENV PACKAGES \
- bc \
- bzip2 \
- ca-certificates \
- ccache \
- clang \
- dbus \
- debianutils \
- diffutils \
- findutils \
- g++ \
- gcc \
- genisoimage \
- gettext \
- git \
- glusterfs-common \
- hostname \
- libaio-dev \
- libasan5 \
- libasound2-dev \
- libattr1-dev \
- libbrlapi-dev \
- libbz2-dev \
- libcacard-dev \
- libcap-ng-dev \
- libcapstone-dev \
- libcurl4-gnutls-dev \
- libdaxctl-dev \
- libdrm-dev \
- libepoxy-dev \
- libfdt-dev \
- libgbm-dev \
- libgcrypt20-dev \
- libglib2.0-dev \
- libgnutls28-dev \
- libgtk-3-dev \
- libibverbs-dev \
- libiscsi-dev \
- libjemalloc-dev \
- libjpeg-turbo8-dev \
- liblttng-ust-dev \
- liblzo2-dev \
- libncursesw5-dev \
- libnfs-dev \
- libnuma-dev \
- libpam0g-dev \
- libpixman-1-dev \
- libpmem-dev \
- libpng-dev \
- libpulse-dev \
- librbd-dev \
- librdmacm-dev \
- libsasl2-dev \
- libsdl2-dev \
- libsdl2-image-dev \
- libseccomp-dev \
- libsnappy-dev \
- libspice-protocol-dev \
- libspice-server-dev \
- libssh-dev \
- libsystemd-dev \
- libtasn1-6-dev \
- libtest-harness-perl \
- libubsan1 \
- libudev-dev \
- libusb-1.0-0-dev \
- libusbredirhost-dev \
- libvdeplug-dev \
- libvirglrenderer-dev \
- libvte-2.91-dev \
- libxen-dev \
- libxml2-dev \
- libzstd-dev \
- locales \
- make \
- multipath-tools \
- netcat-openbsd \
- nettle-dev \
- ninja-build \
- openssh-client \
- perl \
- pkgconf \
- python3 \
- python3-numpy \
- python3-opencv \
- python3-pil \
- python3-pip \
- python3-setuptools \
- python3-sphinx \
- python3-venv \
- python3-wheel \
- python3-yaml \
- rpm2cpio \
- sed \
- sparse \
- systemtap-sdt-dev \
- tar \
- tesseract-ocr \
- tesseract-ocr-eng \
- texinfo \
- vim-nox \
- xfslibs-dev \
- zlib1g-dev
-RUN apt-get update && \
- DEBIAN_FRONTEND=noninteractive apt-get -y install $PACKAGES
-RUN dpkg -l $PACKAGES | sort > /packages.txt
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ apt-get update && \
+ apt-get install -y eatmydata && \
+ eatmydata apt-get dist-upgrade -y && \
+ eatmydata apt-get install --no-install-recommends -y \
+ bc \
+ bzip2 \
+ ca-certificates \
+ ccache \
+ clang \
+ dbus \
+ debianutils \
+ diffutils \
+ findutils \
+ g++ \
+ gcc \
+ genisoimage \
+ gettext \
+ git \
+ glusterfs-common \
+ hostname \
+ libaio-dev \
+ libasan5 \
+ libasound2-dev \
+ libattr1-dev \
+ libbrlapi-dev \
+ libbz2-dev \
+ libcacard-dev \
+ libcap-ng-dev \
+ libcapstone-dev \
+ libcurl4-gnutls-dev \
+ libdaxctl-dev \
+ libdrm-dev \
+ libepoxy-dev \
+ libfdt-dev \
+ libgbm-dev \
+ libgcrypt20-dev \
+ libglib2.0-dev \
+ libgnutls28-dev \
+ libgtk-3-dev \
+ libibverbs-dev \
+ libiscsi-dev \
+ libjemalloc-dev \
+ libjpeg-turbo8-dev \
+ liblttng-ust-dev \
+ liblzo2-dev \
+ libncursesw5-dev \
+ libnfs-dev \
+ libnuma-dev \
+ libpam0g-dev \
+ libpixman-1-dev \
+ libpmem-dev \
+ libpng-dev \
+ libpulse-dev \
+ librbd-dev \
+ librdmacm-dev \
+ libsasl2-dev \
+ libsdl2-dev \
+ libsdl2-image-dev \
+ libseccomp-dev \
+ libsnappy-dev \
+ libspice-protocol-dev \
+ libspice-server-dev \
+ libssh-dev \
+ libsystemd-dev \
+ libtasn1-6-dev \
+ libtest-harness-perl \
+ libubsan1 \
+ libudev-dev \
+ libusb-1.0-0-dev \
+ libusbredirhost-dev \
+ libvdeplug-dev \
+ libvirglrenderer-dev \
+ libvte-2.91-dev \
+ libxen-dev \
+ libxml2-dev \
+ libzstd-dev \
+ locales \
+ make \
+ multipath-tools \
+ netcat-openbsd \
+ nettle-dev \
+ ninja-build \
+ openssh-client \
+ perl \
+ pkgconf \
+ python3 \
+ python3-numpy \
+ python3-opencv \
+ python3-pil \
+ python3-pip \
+ python3-setuptools \
+ python3-sphinx \
+ python3-venv \
+ python3-wheel \
+ python3-yaml \
+ rpm2cpio \
+ sed \
+ sparse \
+ systemtap-sdt-dev \
+ tar \
+ tesseract-ocr \
+ tesseract-ocr-eng \
+ texinfo \
+ vim-nox \
+ xfslibs-dev \
+ zlib1g-dev && \
+ eatmydata apt-get autoremove -y && \
+ eatmydata apt-get autoclean -y && \
+ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
+ dpkg-reconfigure locales && \
+ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /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
+
+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"
# https://bugs.launchpad.net/qemu/+bug/1838763
ENV QEMU_CONFIGURE_OPTS --disable-libssh
--
2.29.2
next prev parent reply other threads:[~2021-01-14 13:12 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-14 13:02 [PATCH v2 00/25] tests/docker: start using libvirt-ci's "lcitool" for dockerfiles Daniel P. Berrangé
2021-01-14 13:02 ` [PATCH v2 01/25] hw/usb/ccid: remove references to NSS Daniel P. Berrangé
2021-01-15 13:42 ` Wainer dos Santos Moschetta
2021-01-14 13:02 ` [PATCH v2 02/25] tests/docker: don't use BUILDKIT in GitLab either Daniel P. Berrangé
2021-01-15 13:53 ` Wainer dos Santos Moschetta
2021-01-15 13:58 ` Daniel P. Berrangé
2021-01-14 13:02 ` [PATCH v2 03/25] tests/docker: use project specific container registries Daniel P. Berrangé
2021-01-14 13:21 ` Philippe Mathieu-Daudé
2021-01-14 13:02 ` [PATCH v2 04/25] tests/docker: use explicit docker.io registry Daniel P. Berrangé
2021-01-14 13:02 ` [PATCH v2 05/25] tests/docker: remove travis container Daniel P. Berrangé
2021-01-14 13:22 ` Philippe Mathieu-Daudé
2021-01-15 14:50 ` Wainer dos Santos Moschetta
2021-01-14 13:02 ` [PATCH v2 06/25] tests/docker: remove FEATURES env var from templates Daniel P. Berrangé
2021-01-14 14:01 ` Philippe Mathieu-Daudé
2021-01-14 13:02 ` [PATCH v2 07/25] tests/docker: fix sorting in package lists Daniel P. Berrangé
2021-01-15 18:06 ` Wainer dos Santos Moschetta
2021-01-14 13:02 ` [PATCH v2 08/25] tests/docker: fix mistakes in centos " Daniel P. Berrangé
2021-01-15 18:39 ` Wainer dos Santos Moschetta
2021-01-14 13:02 ` [PATCH v2 09/25] tests/docker: fix mistakes in fedora package list Daniel P. Berrangé
2021-01-15 18:46 ` Wainer dos Santos Moschetta
2021-01-14 13:02 ` [PATCH v2 10/25] tests/docker: fix mistakes in ubuntu package lists Daniel P. Berrangé
2021-01-15 18:55 ` Wainer dos Santos Moschetta
2021-01-14 13:02 ` [PATCH v2 11/25] tests/docker: remove mingw packages from Fedora Daniel P. Berrangé
2021-01-14 13:02 ` [PATCH v2 12/25] tests/docker: add script for automating container refresh Daniel P. Berrangé
2021-01-14 13:31 ` Philippe Mathieu-Daudé
2021-01-15 20:35 ` Wainer dos Santos Moschetta
2021-01-14 13:02 ` [PATCH v2 13/25] tests/docker: expand centos7 package list Daniel P. Berrangé
2021-01-14 13:34 ` Philippe Mathieu-Daudé
2021-03-03 14:51 ` Thomas Huth
2021-03-03 15:04 ` Daniel P. Berrangé
2021-01-14 13:02 ` [PATCH v2 14/25] tests/docker: expand centos8 " Daniel P. Berrangé
2021-01-14 13:34 ` Philippe Mathieu-Daudé
2021-01-14 13:02 ` [PATCH v2 15/25] tests/docker: expand fedora " Daniel P. Berrangé
2021-01-14 13:58 ` Philippe Mathieu-Daudé
2021-01-14 13:02 ` [PATCH v2 16/25] tests/docker: expand ubuntu1804 " Daniel P. Berrangé
2021-01-14 13:58 ` Philippe Mathieu-Daudé
2021-01-14 13:02 ` [PATCH v2 17/25] tests/docker: expand ubuntu2004 " Daniel P. Berrangé
2021-01-14 13:59 ` Philippe Mathieu-Daudé
2021-01-14 13:02 ` [PATCH v2 18/25] tests/docker: expand opensuse-leap " Daniel P. Berrangé
2021-01-14 13:59 ` Philippe Mathieu-Daudé
2021-01-14 13:02 ` [PATCH v2 19/25] tests/docker: auto-generate centos7 with lcitool Daniel P. Berrangé
2021-01-14 13:36 ` Philippe Mathieu-Daudé
2021-01-14 13:02 ` [PATCH v2 20/25] tests/docker: auto-generate centos8 " Daniel P. Berrangé
2021-01-14 13:36 ` Philippe Mathieu-Daudé
2021-01-14 13:02 ` [PATCH v2 21/25] tests/docker: auto-generate fedora " Daniel P. Berrangé
2021-01-14 13:37 ` Philippe Mathieu-Daudé
2021-01-14 13:02 ` Daniel P. Berrangé [this message]
2021-01-14 13:37 ` [PATCH v2 22/25] tests/docker: auto-generate ubuntu1804 " Philippe Mathieu-Daudé
2021-01-14 13:39 ` Philippe Mathieu-Daudé
2021-01-14 13:02 ` [PATCH v2 23/25] tests/docker: auto-generate ubuntu2004 " Daniel P. Berrangé
2021-01-14 13:56 ` Philippe Mathieu-Daudé
2021-01-14 13:02 ` [PATCH v2 24/25] tests/docker: auto-generate opensuse-leap " Daniel P. Berrangé
2021-01-14 13:57 ` Philippe Mathieu-Daudé
2021-01-14 13:02 ` [PATCH v2 25/25] tests/docker: remove ubuntu container Daniel P. Berrangé
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=20210114130245.1654081-23-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).