From nobody Wed Feb 11 02:09:10 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516027448105544.713692340098; Mon, 15 Jan 2018 06:44:08 -0800 (PST) Received: from localhost ([::1]:39995 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb5zb-0002rq-4i for importer@patchew.org; Mon, 15 Jan 2018 09:44:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44764) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb5rH-00041X-Nw for qemu-devel@nongnu.org; Mon, 15 Jan 2018 09:35:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eb5rG-00016f-HW for qemu-devel@nongnu.org; Mon, 15 Jan 2018 09:35:31 -0500 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:40517) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eb5rG-00016U-2w for qemu-devel@nongnu.org; Mon, 15 Jan 2018 09:35:30 -0500 Received: by mail-qt0-x244.google.com with SMTP id u42so14364840qte.7 for ; Mon, 15 Jan 2018 06:35:29 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id b75sm3402027qkb.73.2018.01.15.06.35.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Jan 2018 06:35:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eAye32tv+WfEGnmqmeD/nz/8TNqIO53Orx/9+Qce5/8=; b=KT55+VEsEqD/dkSb0UI5fDU0VS0XhRkgVnJjsfyC+5yPtrjGJebZTIO/lW0JwbRPTi 4cYmeQ1n7DYjIuyuwSLeQp76G0pK/9Y+shInX9kixZiI3b4dXP0QUM17+NJg+fN61+FV ofIzvKaE4BYPe71IetgtpW1pBM57XY6O1kN0K2v/BZG3GWd5e7d1fdWRcCY9nVT1pUpf DWsZnhlnbDRiHxicGT2CNsLXl7YTs1gJvtpKVlSxOoRMZ+dO9p75aT66a+8WCk6JyCIa GOkXpeDNH9d/17tkUtAWpICmLxvZi6q8kssRWqWg3u9utkTLFYG8L9FwJV3l7qhTz+qR ydcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=eAye32tv+WfEGnmqmeD/nz/8TNqIO53Orx/9+Qce5/8=; b=CeRv+86HzsCeqPNvo2+ondsiPNE3L02getCUtemWKeCKEWyU9/kQKJ+eWL77glUL6S yxNFUswMEHEe5DKBigcMjntxJQlqWwX781Ni0R7BHxoAOGDAq9L0ASiCqe4ILDoUtTEZ IwBx3siDK92AwLyt03C4z2J+6aI5ux3j7b8V9Lc/7rhfMTdSQDFlzigXVCGVQU3Esll+ uIgOalAH1Cz1ZumVknTopIJgQPYOqhSE7elwdTGdbA2C9khEActptlUgGmJETiIVgxKI ehLHydYJkXQTfwIRMV0Z3npVGQWSomYmzI4dJAe3p920JUW0IJf9DqvS+UeTb/JqkENZ rdww== X-Gm-Message-State: AKwxytcO9+U6Lne1HncFPhatv0ER/3mZG8HmggZX4ImtUrV7TO8v76bY oxFq+3Y9RzidQYyDfEqPej0= X-Google-Smtp-Source: ACJfBovPwbPfQdn4T5+a1v06MV0Ul/VZibzRhJpszHofDsQGzuzPsuuku+Vs70hNeQ0XBBASyja7Gg== X-Received: by 10.237.32.225 with SMTP id 88mr46614637qtb.122.1516026929503; Mon, 15 Jan 2018 06:35:29 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Fam Zheng , Paolo Bonzini Date: Mon, 15 Jan 2018 11:34:58 -0300 Message-Id: <20180115143500.22631-8-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180115143500.22631-1-f4bug@amsat.org> References: <20180115143500.22631-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::244 Subject: [Qemu-devel] [PATCH v2 7/8] docker: warn users to use newer fedora25/fedora27 base image X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 deprecate the generic 'fedora' image, but stay backward incompatible Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/docker/Makefile.include | 3 ++- tests/docker/dockerfiles/fedora.docker | 29 ++++++++++++----------------- tests/docker/dockerfiles/fedora25.docker | 18 ++++++++++++++++++ 3 files changed, 32 insertions(+), 18 deletions(-) create mode 100644 tests/docker/dockerfiles/fedora25.docker diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 1adea40499..950ef51d35 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -4,7 +4,7 @@ =20 DOCKER_SUFFIX :=3D .docker DOCKER_FILES_DIR :=3D $(SRC_PATH)/tests/docker/dockerfiles -DOCKER_DEPRECATED_IMAGES :=3D debian ubuntu +DOCKER_DEPRECATED_IMAGES :=3D debian fedora ubuntu DOCKER_IMAGES :=3D $(filter-out $(DOCKER_DEPRECATED_IMAGES),$(sort $(notdi= r $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))) DOCKER_TARGETS :=3D $(patsubst %,docker-image-%,$(DOCKER_IMAGES)) # Use a global constant ccache directory to speed up repetitive builds @@ -61,6 +61,7 @@ docker-image-debian-ppc64el-cross: docker-image-debian9 docker-image-debian-s390x-cross: docker-image-debian9 docker-image-debian-win32-cross: docker-image-debian8-mxe docker-image-debian-win64-cross: docker-image-debian8-mxe +docker-image-fedora: docker-image-fedora25 docker-image-ubuntu: docker-image-ubuntu16.04 docker-image-travis: NOUSER=3D1 =20 diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfi= les/fedora.docker index 4b26c3aded..961534275f 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -1,18 +1,13 @@ -FROM fedora:latest -ENV PACKAGES \ - ccache gettext git tar PyYAML sparse flex bison python2 bzip2 hostname= \ - glib2-devel pixman-devel zlib-devel SDL-devel libfdt-devel \ - gcc gcc-c++ clang make perl which bc findutils libaio-devel \ - nettle-devel \ - mingw32-pixman mingw32-glib2 mingw32-gmp mingw32-SDL mingw32-pkg-confi= g \ - mingw32-gtk2 mingw32-gtk3 mingw32-gnutls mingw32-nettle mingw32-libtas= n1 \ - mingw32-libjpeg-turbo mingw32-libpng mingw32-curl mingw32-libssh2 \ - mingw32-bzip2 \ - mingw64-pixman mingw64-glib2 mingw64-gmp mingw64-SDL mingw64-pkg-confi= g \ - mingw64-gtk2 mingw64-gtk3 mingw64-gnutls mingw64-nettle mingw64-libtas= n1 \ - mingw64-libjpeg-turbo mingw64-libpng mingw64-curl mingw64-libssh2 \ - mingw64-bzip2 +# SPDX-License-Identifier: GPL-2.0-or-later +# +# This template is deprecated, it was previously based on Fedora 25 on QEM= U 2.9. +# Now than more recent releases are out, please use qemu:fedora25 as base = for +# Fedora 25. +# +FROM qemu:fedora25 =20 -RUN dnf install -y $PACKAGES -RUN rpm -q $PACKAGES | sort > /packages.txt -ENV FEATURES mingw clang pyyaml +RUN for n in $(seq 8); do echo; done && \ + echo "\n\t\tThis image is deprecated." && echo && \ + echo "\tUse 'FROM qemu:fedora27' to use the Fedora 27 image" && \ + echo "\tor 'FROM qemu:fedora25' to use the old Fedora 25." && \ + for n in $(seq 8); do echo; done diff --git a/tests/docker/dockerfiles/fedora25.docker b/tests/docker/docker= files/fedora25.docker new file mode 100644 index 0000000000..b53fe63b5c --- /dev/null +++ b/tests/docker/dockerfiles/fedora25.docker @@ -0,0 +1,18 @@ +FROM fedora:25 +ENV PACKAGES \ + ccache gettext git tar PyYAML sparse flex bison python2 bzip2 hostname= \ + glib2-devel pixman-devel zlib-devel SDL-devel libfdt-devel \ + gcc gcc-c++ clang make perl which bc findutils libaio-devel \ + nettle-devel \ + mingw32-pixman mingw32-glib2 mingw32-gmp mingw32-SDL mingw32-pkg-confi= g \ + mingw32-gtk2 mingw32-gtk3 mingw32-gnutls mingw32-nettle mingw32-libtas= n1 \ + mingw32-libjpeg-turbo mingw32-libpng mingw32-curl mingw32-libssh2 \ + mingw32-bzip2 \ + mingw64-pixman mingw64-glib2 mingw64-gmp mingw64-SDL mingw64-pkg-confi= g \ + mingw64-gtk2 mingw64-gtk3 mingw64-gnutls mingw64-nettle mingw64-libtas= n1 \ + mingw64-libjpeg-turbo mingw64-libpng mingw64-curl mingw64-libssh2 \ + mingw64-bzip2 + +RUN dnf install -y $PACKAGES +RUN rpm -q $PACKAGES | sort > /packages.txt +ENV FEATURES mingw clang pyyaml --=20 2.15.1