From patchwork Mon Jul 12 12:26:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 473122 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2937987jao; Mon, 12 Jul 2021 06:23:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyND5afR9ATwRJtr7WMai7tDBmBIdNCtZYr7YtKuSCL4Ze6jAI1Q6w1DdTjEMV7HTyvQ3HN X-Received: by 2002:a17:906:4d08:: with SMTP id r8mr19658038eju.464.1626096197646; Mon, 12 Jul 2021 06:23:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626096197; cv=none; d=google.com; s=arc-20160816; b=ivjTGfCgVFZzqdEOA18zSBxP7uLU7/jZeOsWpSqjzjBDt80Ln+wFzqtHUCELRft8Rp KIFkoB/8PicmlsE/CAJIbKJwyj4/1ys0ngSjYjL/HJB5x6nxV8q5WW1YZai3rkSFfH3j Kr2FSmU7Cmse4OpCXsWkJCTdvrEBZyebYakqQ9UN0nWZRKe8IPb8A6vf40ivsPE+o2q9 ApXnWiHT48hYmMJwPwQPI3KPXR9Q9C9kDha/SESZ0v48aS72uTOOQqeEirdwoR6TFPy9 xynSlMUbh82GW9CY7WHqLPrc3nADB8F2Ib0w+JlYFwM5Lh6LEYdVVNVLv2xoFZYy26OR 3xgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=cRpuG5GjYZFaZpFczANpcbFMUqHvtpS+BlaRY7FR9ww=; b=o36FHn4Y7LIXH3AK0VWY9gVdQhJtTG8QUgsZlGAGyhut7vDHGhx4/YOx05emq8Ci/L a+ABbAgtaxPSDmojSxgRfOJIEoSz4p5NTHmSVvMTp+2zGuncj3I+mA861fCrTf/PdtYd GqJddIuHbI/bNqC8umFelZgn2vcLSD7YagZuLeNvA4O16Vzzc58/XWU9yfO6WYqYpQka 1PSnqn7qtaww5hldLrgZ4Lma1pxdBzjuKHeuZVM1mdr+zvABaeqf0DIqAAZWXv6WUOwR HIgCJiDq/hihUKkWxUT6lcFtrCRdGL1qzZ5JRC5KtVwoVGPg8GWd3mjF2vpjJjMRClZZ BxLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Eiad69jK; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id nc18si17622773ejc.167.2021.07.12.06.23.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jul 2021 06:23:17 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Eiad69jK; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:37082 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vu0-0005LM-In for patch@linaro.org; Mon, 12 Jul 2021 09:23:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43038) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2vH3-0007bJ-M5 for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:43:01 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:40634) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2vH1-0006HS-Pq for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:43:01 -0400 Received: by mail-wr1-x432.google.com with SMTP id l7so24503114wrv.7 for ; Mon, 12 Jul 2021 05:42:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cRpuG5GjYZFaZpFczANpcbFMUqHvtpS+BlaRY7FR9ww=; b=Eiad69jK+FNvRvB0MqK6bA7ZhnGZFB1PjoD3hlbDWd75jxvojV4vBhQbtqUFFJsS0Z k6V6YQZdaYYyAg+AZfkVhx2MPr/84tY5O5RzTBI9C0+55mNQ5xWyAzomBd45d0E9uonp m95cbGcqPyOhxUFl912dOPd1eFhrFtNSqdyPIGI3QBqlbF49ZQGCbd/iosQkHk9AQsL8 XfozznHh9SJg6ORWhmm4TQDnyB8V1qVrRclWMwLDL7SFLaslDAywXlrWaZ6Tp3KT+KCR JNpfy+nEIqZgD2mYURZLPFIfFWiHMVL4VVP/bz9LyLdXnidZ7stPqhQz8m4WJuW5rAVn jFTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cRpuG5GjYZFaZpFczANpcbFMUqHvtpS+BlaRY7FR9ww=; b=k1WFNCrsR87lJvuAej5CjphyY8KT5jMWtluWyVdwLrY/N0r4SH4B25IYGiFrURGKte 5OfWuTp+LYVPVv06IFxHA2hVozSkud09JBTnCn8ICUQ8wZbaCPgZAzHCvuOPfTXlBbPc WLGqcchjutH0Go1bx+1390RgAMZCjfu30sW6ikwiwi9deI5WK+HzdPpp3pKqD6cD/xTc hnvQD01DvFitWb2wrKL9jN8CmsHSfzjVxvxsGHP184f7htqQS383RVPjpQTTG2A4bOcQ X1Comyc6ug84xDWKn+gb0Oxyetlgj0GaXx40CaWBSCDSKnWfTcqUasi2zPIHw+gNOQsq 1NaA== X-Gm-Message-State: AOAM530Kcmou0rySlLrsXzuTlT2L1ZpqRQe/LU2bHseFusvCXNsUD74O 9DZFyIttjoRABKVapVRzKUlfgA== X-Received: by 2002:a5d:47a7:: with SMTP id 7mr27350949wrb.150.1626093778237; Mon, 12 Jul 2021 05:42:58 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id x1sm21290835wmc.0.2021.07.12.05.42.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:42:55 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 24D3C1FF9B; Mon, 12 Jul 2021 13:26:55 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 12/40] tests/docker: use explicit docker.io registry Date: Mon, 12 Jul 2021 13:26:25 +0100 Message-Id: <20210712122653.11354-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-devel@nongnu.org, Willian Rampazzo , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Daniel P. Berrangé It is good practice to use an explicit registry for referencing the base image. This is because some distros will inject their own registries into the search path. For example registry.fedoraproject.org comes ahead of docker.io. Using an explicit registry avoids wasting time querying multiple registries for images that they won't have. Signed-off-by: Daniel P. Berrangé Signed-off-by: Alex Bennée Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée Message-Id: <20210623142245.307776-5-berrange@redhat.com> Message-Id: <20210709143005.1554-13-alex.bennee@linaro.org> -- 2.20.1 diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker index 03e0440e03..8f810810f3 100644 --- a/tests/docker/dockerfiles/centos8.docker +++ b/tests/docker/dockerfiles/centos8.docker @@ -1,4 +1,4 @@ -FROM centos:8.3.2011 +FROM docker.io/centos:8 RUN dnf -y update ENV PACKAGES \ diff --git a/tests/docker/dockerfiles/debian-xtensa-cross.docker b/tests/docker/dockerfiles/debian-xtensa-cross.docker index ba4148299c..2f11b3b7bc 100644 --- a/tests/docker/dockerfiles/debian-xtensa-cross.docker +++ b/tests/docker/dockerfiles/debian-xtensa-cross.docker @@ -5,7 +5,7 @@ # using a prebuilt toolchains for Xtensa cores from: # https://github.com/foss-xtensa/toolchain/releases # -FROM debian:stretch-slim +FROM docker.io/library/debian:stretch-slim RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \ diff --git a/tests/docker/dockerfiles/debian10.docker b/tests/docker/dockerfiles/debian10.docker index 4ffe47671e..a27b88df55 100644 --- a/tests/docker/dockerfiles/debian10.docker +++ b/tests/docker/dockerfiles/debian10.docker @@ -7,7 +7,7 @@ # On its own you can't build much but the docker-foo-cross targets # build on top of the base debian image. # -FROM debian:buster-slim +FROM docker.io/library/debian:buster-slim # Duplicate deb line as deb-src RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list diff --git a/tests/docker/dockerfiles/debian11.docker b/tests/docker/dockerfiles/debian11.docker index 5adfd62d55..febf884f8f 100644 --- a/tests/docker/dockerfiles/debian11.docker +++ b/tests/docker/dockerfiles/debian11.docker @@ -8,7 +8,7 @@ # On its own you can't build much but the docker-foo-cross targets # build on top of the base debian image. # -FROM debian:bullseye-slim +FROM docker.io/library/debian:bullseye-slim # Duplicate deb line as deb-src RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/ubuntu.docker index 100cfa76e3..e0ff425c01 100644 --- a/tests/docker/dockerfiles/ubuntu.docker +++ b/tests/docker/dockerfiles/ubuntu.docker @@ -9,7 +9,7 @@ # system won't pick up that it has changed. # -FROM ubuntu:20.04 +FROM docker.io/library/ubuntu:20.04 ENV PACKAGES \ ccache \ clang \ diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/ubuntu1804.docker index 86114be23a..adcdef8244 100644 --- a/tests/docker/dockerfiles/ubuntu1804.docker +++ b/tests/docker/dockerfiles/ubuntu1804.docker @@ -1,4 +1,4 @@ -FROM ubuntu:18.04 +FROM docker.io/library/ubuntu:18.04 ENV PACKAGES \ ccache \ clang \ diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker index b33ed139d9..78755bc2e3 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -1,4 +1,4 @@ -FROM ubuntu:20.04 +FROM docker.io/library/ubuntu:20.04 ENV PACKAGES flex bison \ bsdmainutils \ ccache \