From patchwork Wed Jul 14 15:00:06 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: 476755 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp655696jao; Wed, 14 Jul 2021 08:07:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwhi2urV7GEzlkXYMA2oJn9xAtOvcRe6qO0MsWSHJ5OIr1uG7pvXHXjPjOpXZ4XK0OCvI3l X-Received: by 2002:a7b:c10b:: with SMTP id w11mr12172573wmi.185.1626275236511; Wed, 14 Jul 2021 08:07:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626275236; cv=none; d=google.com; s=arc-20160816; b=D8JOkJmqjMTgyloGKTXxjJ1vROFFHkMTAw09p+n/nDlIc8C09iGyTF3zlHbz3dUqOO 1IV4iKvXnZ6ANoxczz9d9nklUz0luh4o5HsLtwbBprHr7iIVaA8oOoVZNf9yDgIGG8eU r9GfAAzkPZUZ+ytZmdfq/sbL7EElxYdDgTPaJIQgDBxR5TES3SFVthG09Rgn7wj+Rvlz 4BHGspMzBYOwvum5VK6kyg2cH217gaxYglTXBjowfqKkBnqpW+BupHVno5+Xu5i3svYw 5SnHf71daosMEqQExGvs3bI1mk0p/6nJOPsLmiRowTU7LnIpfg6+ODzIn3Ij0cokGGkk yfDQ== 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=jDy0s36iCCjLgx8TjlbVEbp6kn6WcVeLgt8GNDpJMH5jOIJRIMCQjzkz/3uIJokZBJ 9a+fRFcG2820axVAt/JrsZYmKLr+33Za8C5USkobl/TbAfLwvVLpTn9ojfYPeVI50MsJ z+KcSL82/QzSHaB8Y+q6KGIS3u1MpjgdWwz+YqxyF42RJ2n9Mo8HRD6lZRg3bfaB3Tx6 +v+oxNppGUYBchsNTpLFmEwK6IrTdNRg7D8RS1LKmDTVkNE01y+zBsQ1mjlwg6gF0slf /FlMJd7VVbqe7pgWnHigpmbqYDmNr6D1Ly7/1sQfHULRWjUifkjEd2xjniBnjTZwDCrz yB+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=wqhoKyp0; 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 h9si3597528wrv.298.2021.07.14.08.07.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:07:16 -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=wqhoKyp0; 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]:36662 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3gTj-0003q0-FB for patch@linaro.org; Wed, 14 Jul 2021 11:07:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49522) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3gNj-0007My-Tj for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:01:04 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:45937) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3gNc-0007ZG-Ox for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:01:02 -0400 Received: by mail-wm1-x32a.google.com with SMTP id u8-20020a7bcb080000b02901e44e9caa2aso1625386wmj.4 for ; Wed, 14 Jul 2021 08:00:56 -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=wqhoKyp0d7cPM0zoNv9KmHf40qvKZhrrR4yzNpqYjuH/yOF9qRlkAaTfV2GtHwwE/k mjlz+tmQMgQZD04/smRslGnFanWE9+QiT3BYYau5D3Hlb/u7FRCZjnLZJIQIWCWiBwDF QYMlqvGXPpYRffyUSLL75bz7DOY2c8RdMHRvhf5ox/fF4R+r4rmjFXufW0wu93rrSG/M /pfbGaE6QrZBa69F7zj4xF0bepruWTg06ca7MCNjHPIdPDbSGVtFyVZ4TTHBgm1lCe8a qHAo1ik7uzM+/3fayvAkP3ghjQscIe4orf5KiOvq9lmAQrRpa3foHp/OuPeh6qunLP9O BMZA== 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=jvoKk5GqU/4ZDJMpN9/JrqgPlPNokGvNF1CSab6Al8ZeuhUJTyaRD1cb77OqpYy0kj h04NuXhrhOQm1BnMkE/NGa6ZkmzyzyWR+NcZgjsaVu/WjOJ7fGqAmRN2LV7pJPZBGcSm FO1G8G0sk5oxJ6UUYvkSOURw/9QZcseKAl0sBE4BE04dLpQFGBtPPvSYMm/gzYxRyvLO V8uS39L314Plw8dlAJAlzn5Ni8pbhlKoweuYHivH3F9x8HnWv2jQyk4kUr6/WBOmG3Tg XAgdBP4vh8Rm2ckpwIHMg0lijWT8BnhZgmjdgzuvUd0k920rUmz/Qt0mVeX/9RlzmnMj rMGA== X-Gm-Message-State: AOAM533MxGhkVcGJ54FDN06fabN/jZvEy3nJoFG2B+dAWNPDLX25u/jg I8r8QagBvr1WQrE8n6rH9nhQsg== X-Received: by 2002:a1c:f70d:: with SMTP id v13mr11368698wmh.183.1626274855402; Wed, 14 Jul 2021 08:00:55 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id a12sm3131497wrh.26.2021.07.14.08.00.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:00:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4E1DF1FF9D; Wed, 14 Jul 2021 16:00:38 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 14/44] tests/docker: use explicit docker.io registry Date: Wed, 14 Jul 2021 16:00:06 +0100 Message-Id: <20210714150036.21060-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32a.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 \