From: "Daniel P. Berrangé" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Fam Zheng" <fam@euphon.net>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Thomas Huth" <thuth@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Beraldo Leal" <bleal@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Willian Rampazzo" <willianr@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PATCH v5 18/18] tests/docker: auto-generate alpine.docker with lcitool
Date: Wed, 15 Dec 2021 14:19:49 +0000 [thread overview]
Message-ID: <20211215141949.3512719-19-berrange@redhat.com> (raw)
In-Reply-To: <20211215141949.3512719-1-berrange@redhat.com>
This commit is best examined using the "-b" option to diff.
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
tests/docker/dockerfiles/alpine.docker | 225 +++++++++++++------------
tests/lcitool/refresh | 1 +
2 files changed, 120 insertions(+), 106 deletions(-)
diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker
index 0ac30c8014..97c7a88d1f 100644
--- a/tests/docker/dockerfiles/alpine.docker
+++ b/tests/docker/dockerfiles/alpine.docker
@@ -1,109 +1,122 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool dockerfile alpine-edge qemu
+#
+# https://gitlab.com/libvirt/libvirt-ci
-FROM alpine:edge
+FROM docker.io/library/alpine:edge
-RUN apk update
-RUN apk upgrade
+RUN apk update && \
+ apk upgrade && \
+ apk add \
+ alsa-lib-dev \
+ attr-dev \
+ bash \
+ bc \
+ bzip2 \
+ bzip2-dev \
+ ca-certificates \
+ capstone-dev \
+ ccache \
+ cdrkit \
+ ceph-dev \
+ clang \
+ ctags \
+ curl-dev \
+ cyrus-sasl-dev \
+ dbus \
+ diffutils \
+ dtc-dev \
+ eudev-dev \
+ findutils \
+ g++ \
+ gcc \
+ gcovr \
+ gettext \
+ git \
+ glib-dev \
+ glib-static \
+ gnutls-dev \
+ gtk+3.0-dev \
+ libaio-dev \
+ libbpf-dev \
+ libcap-ng-dev \
+ libdrm-dev \
+ libepoxy-dev \
+ libffi-dev \
+ libgcrypt-dev \
+ libjpeg-turbo-dev \
+ libnfs-dev \
+ libpng-dev \
+ libseccomp-dev \
+ libselinux-dev \
+ libslirp-dev \
+ libssh-dev \
+ libtasn1-dev \
+ liburing-dev \
+ libusb-dev \
+ libxml2-dev \
+ linux-pam-dev \
+ llvm11 \
+ lttng-ust-dev \
+ lzo-dev \
+ make \
+ mesa-dev \
+ meson \
+ multipath-tools \
+ ncurses-dev \
+ ndctl-dev \
+ net-tools \
+ nettle-dev \
+ nmap-ncat \
+ numactl-dev \
+ openssh-client \
+ pcre-dev \
+ perl \
+ perl-test-harness \
+ pixman-dev \
+ pkgconf \
+ pulseaudio-dev \
+ py3-numpy \
+ py3-pillow \
+ py3-pip \
+ py3-sphinx \
+ py3-sphinx_rtd_theme \
+ py3-virtualenv \
+ py3-yaml \
+ python3 \
+ rpm2cpio \
+ samurai \
+ sdl2-dev \
+ sdl2_image-dev \
+ sed \
+ snappy-dev \
+ sparse \
+ spice-dev \
+ spice-protocol \
+ tar \
+ tesseract-ocr \
+ texinfo \
+ usbredir-dev \
+ util-linux \
+ vde2-dev \
+ virglrenderer-dev \
+ vte3-dev \
+ which \
+ xen-dev \
+ xfsprogs-dev \
+ zlib-dev \
+ zlib-static \
+ zstd-dev && \
+ mkdir -p /usr/libexec/ccache-wrappers && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
-# Please keep this list sorted alphabetically
-ENV PACKAGES \
- alsa-lib-dev \
- attr-dev \
- bash \
- bc \
- bzip2 \
- bzip2-dev \
- ca-certificates \
- capstone-dev \
- ccache \
- cdrkit \
- ceph-dev \
- clang \
- ctags \
- curl-dev \
- cyrus-sasl-dev \
- dbus \
- diffutils \
- dtc-dev \
- eudev-dev \
- findutils \
- g++ \
- gcc \
- gcovr \
- gettext \
- git \
- glib-dev \
- glib-static \
- gnutls-dev \
- gtk+3.0-dev \
- libaio-dev \
- libbpf-dev \
- libcap-ng-dev \
- libdrm-dev \
- libepoxy-dev \
- libffi-dev \
- libgcrypt-dev \
- libjpeg-turbo-dev \
- libnfs-dev \
- libpng-dev \
- libseccomp-dev \
- libselinux-dev \
- libslirp-dev \
- libssh-dev \
- libtasn1-dev \
- liburing-dev \
- libusb-dev \
- libxml2-dev \
- linux-pam-dev \
- llvm11 \
- lttng-ust-dev \
- lzo-dev \
- make \
- mesa-dev \
- meson \
- multipath-tools \
- ncurses-dev \
- ndctl-dev \
- net-tools \
- nettle-dev \
- nmap-ncat \
- numactl-dev \
- openssh-client \
- pcre-dev \
- perl \
- perl-test-harness \
- pixman-dev \
- pkgconf \
- pulseaudio-dev \
- py3-numpy \
- py3-pillow \
- py3-pip \
- py3-sphinx \
- py3-sphinx_rtd_theme \
- py3-virtualenv \
- py3-yaml \
- python3 \
- rpm2cpio \
- samurai \
- sdl2-dev \
- sdl2_image-dev \
- sed \
- snappy-dev \
- sparse \
- spice-dev \
- spice-protocol \
- tar \
- tesseract-ocr \
- texinfo \
- usbredir-dev \
- util-linux \
- vde2-dev \
- virglrenderer-dev \
- vte3-dev \
- which \
- xen-dev \
- xfsprogs-dev \
- zlib-dev \
- zlib-static \
- zstd-dev
-
-RUN apk add $PACKAGES
+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/lcitool/refresh b/tests/lcitool/refresh
index b8cf0a7386..033120e223 100755
--- a/tests/lcitool/refresh
+++ b/tests/lcitool/refresh
@@ -84,6 +84,7 @@ try:
generate_dockerfile("ubuntu2004", "ubuntu-2004",
trailer="".join(ubuntu2004_tsanhack))
generate_dockerfile("opensuse-leap", "opensuse-leap-152")
+ generate_dockerfile("alpine", "alpine-edge")
generate_cirrus("freebsd-12")
generate_cirrus("freebsd-13")
--
2.33.1
next prev parent reply other threads:[~2021-12-15 15:08 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-15 14:19 [PATCH v5 00/18] tests/docker: start using libvirt-ci's "lcitool" for dockerfiles Daniel P. Berrangé
2021-12-15 14:19 ` [PATCH v5 01/18] ui: avoid compiler warnings from unused clipboard info variable Daniel P. Berrangé
2021-12-15 14:19 ` [PATCH v5 02/18] spice: Update QXLInterface for spice >= 0.15.0 Daniel P. Berrangé
2021-12-15 14:19 ` [PATCH v5 03/18] meson: require liburing >= 0.3 Daniel P. Berrangé
2021-12-15 14:19 ` [PATCH v5 04/18] ui: avoid warnings about directdb on Alpine / musl libc Daniel P. Berrangé
2021-12-15 14:19 ` [PATCH v5 05/18] ci: explicitly skip I/O tests on alpine Daniel P. Berrangé
2021-12-15 14:19 ` [PATCH v5 06/18] tests/docker: switch fedora image to release 35 Daniel P. Berrangé
2021-12-15 14:19 ` [PATCH v5 07/18] tests: integrate lcitool for generating build env manifests Daniel P. Berrangé
2021-12-15 14:19 ` [PATCH v5 08/18] tests/docker: auto-generate centos8.docker with lcitool Daniel P. Berrangé
2021-12-15 14:19 ` [PATCH v5 09/18] tests/docker: auto-generate fedora.docker " Daniel P. Berrangé
2021-12-15 14:19 ` [PATCH v5 10/18] tests/docker: auto-generate ubuntu1804.docker " Daniel P. Berrangé
2021-12-15 14:19 ` [PATCH v5 11/18] tests/docker: auto-generate ubuntu2004.docker " Daniel P. Berrangé
2021-12-15 14:19 ` [PATCH v5 12/18] tests/docker: auto-generate opensuse-leap.docker " Daniel P. Berrangé
2021-12-15 14:19 ` [PATCH v5 13/18] tests/docker: remove ubuntu.docker container Daniel P. Berrangé
2021-12-15 14:19 ` [PATCH v5 14/18] .gitlab-ci.d/cirrus: auto-generate variables with lcitool Daniel P. Berrangé
2021-12-15 14:19 ` [PATCH v5 15/18] tests/docker: updates to alpine package list Daniel P. Berrangé
2021-12-15 14:19 ` [PATCH v5 16/18] tests/docker: fix sorting of alpine image package lists Daniel P. Berrangé
2021-12-15 14:19 ` [PATCH v5 17/18] tests/docker: fully expand the alpine package list Daniel P. Berrangé
2021-12-15 14:19 ` Daniel P. Berrangé [this message]
2022-01-05 9:33 ` [PATCH v5 00/18] tests/docker: start using libvirt-ci's "lcitool" for dockerfiles Alex Bennée
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=20211215141949.3512719-19-berrange@redhat.com \
--to=berrange@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=bleal@redhat.com \
--cc=f4bug@amsat.org \
--cc=fam@euphon.net \
--cc=kraxel@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
--cc=wainersm@redhat.com \
--cc=willianr@redhat.com \
/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).