From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BAB37C433FE for ; Wed, 15 Dec 2021 15:08:35 +0000 (UTC) Received: from localhost ([::1]:40082 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mxVtS-0000az-PL for qemu-devel@archiver.kernel.org; Wed, 15 Dec 2021 10:08:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48966) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxV9E-0002FT-J3 for qemu-devel@nongnu.org; Wed, 15 Dec 2021 09:20:48 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:25021) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxV9C-0001J2-3l for qemu-devel@nongnu.org; Wed, 15 Dec 2021 09:20:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639578045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GNfXk77IW70ZUrqGv/VoHUbgV48RVxyHxtkNgNPidx0=; b=ZXWp6/d8H3chx2kS/bzk9XURhVXa0ufubWG6n1jNTGvHWhxPruMeXIA+lpY10QKbtSEWhr kjMY8UGbIWgn3/52kNh8dU6bve9Ugv9xgxGf/P+/8O9GR2LcPT6NkZDbCWL7TjyQgd/VXi fGQhuQYXe9isLJcNwVzxKPtISCAMXlI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-333-IL4TapgiNO2mvDE-OBkB5A-1; Wed, 15 Dec 2021 09:20:42 -0500 X-MC-Unique: IL4TapgiNO2mvDE-OBkB5A-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AF144835E24; Wed, 15 Dec 2021 14:20:40 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.22.8.165]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7F3FA101E692; Wed, 15 Dec 2021 14:20:38 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v5 18/18] tests/docker: auto-generate alpine.docker with lcitool Date: Wed, 15 Dec 2021 14:19:49 +0000 Message-Id: <20211215141949.3512719-19-berrange@redhat.com> In-Reply-To: <20211215141949.3512719-1-berrange@redhat.com> References: <20211215141949.3512719-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.719, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Peter Maydell , Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Beraldo Leal , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Willian Rampazzo , Gerd Hoffmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This commit is best examined using the "-b" option to diff. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Daniel P. Berrangé --- 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