From patchwork Tue Jul 6 14:57:50 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: 470455 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp5086217jao; Tue, 6 Jul 2021 08:05:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxJB9WLH/4ny6kFKwoQiJTb980ug1iTtCFlafAkX4NoRx2cSCqpkIpn+8KK15JwPBPs1QD+ X-Received: by 2002:a1c:f312:: with SMTP id q18mr21579096wmq.12.1625583937309; Tue, 06 Jul 2021 08:05:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625583937; cv=none; d=google.com; s=arc-20160816; b=FWmCl/KAHEBny0cwqvCjo5Qa50JhU3tQYa3HIUfae3/ayWPrkjQz9QTtbKkqrAQfvM 0zBL7bPU73rsULPemxVSQG3ou0QDcslKkNn8IvT2UlOOqQNoIlU4YxoBbPz1y5oLl8la FhjefdL93ZUb3l4T+pWE2Fyll6j/XTUipxQVfrXuF+1dJNTmIO6Am78pCZ9ze4gG3nKP ap1IoxCfGjGwpC5JOI1ViR617bCG4gA0KbXs4WDBecbFcFPJUGB++6IPcIlK12Pvna7G oqGI2jFKDD+bapzAfpnjgFCvYHSFFFk1sASWUQIeGRLWbizluXFVfLZynrIU07c0MhLA lCRQ== 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=SXT7sol+1pk4kO/P5DB1EVTnMN8KnY6InxmVm1gqicQ=; b=jyglul0ixakTMUBHr3QNO9VvsQu5pNkj/ekkvX/tqmfW6XpZPdJ5RhD6Bc7WoPKWZT Zy7RCOm7co0JIRtOgGxs3kDw91+RmLr0uCMEHLtR0INebs9xNdm3IhyACvVnEw4iNQ3V ETKuQs2e4xbKKiwct7DtVJUZUlXHFhPKNG8j6Va390cKpMXB7+u4e8iXJPI8WroIneTf BPtQ9i50vN6MavJj132JOFv/CzvlvZPDUjrn8DesY79MpfXeLe9rvczxCMa53BrnioWS +E7H9ZJqOhI3Q7vCMOliovZKQF8p+JvqKND+/u1SX+Z3oaOzcLCyn1T4mRkQIrX3n2R6 H6Ig== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=efa2nTxk; 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 r21si17613156ejo.665.2021.07.06.08.05.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Jul 2021 08:05:37 -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=efa2nTxk; 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]:38048 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0mdk-0008CG-4o for patch@linaro.org; Tue, 06 Jul 2021 11:05:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33272) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mX7-0004jt-Fo for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:45 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:37736) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mWv-000248-PP for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:45 -0400 Received: by mail-wm1-x333.google.com with SMTP id r9-20020a7bc0890000b02901f347b31d55so1983150wmh.2 for ; Tue, 06 Jul 2021 07:58:32 -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=SXT7sol+1pk4kO/P5DB1EVTnMN8KnY6InxmVm1gqicQ=; b=efa2nTxktRp7zXniq746JdLr742k0jtnT2gf5cBc47kIxAz9+s5prHEzHJzxhAfHm0 xoY8s9p5oDV3q8OR5ZyZlLGQ8gQowwqAdM8rAwVSOp3f69EI3D5HjcvgBIl3WPM5TbLx P701xtt8jgni3DSCHI2TS2A9NQamlsGQIbmt4uUyKSphTZw+d71PfprJuRx4k86lvyCr gYhn4JUzbGdtnswk33OCTI4QPb3ZKQhcwS6wSeCyDJhmzvMNwDg8xh7fue0Uedf/BT+9 snzqdHzUlb84QGPTmlTDGnHxE75/HH0W/LEMN49zn2Cy79f1Z7DfVkAo5cg7mPoyB3xE wpfQ== 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=SXT7sol+1pk4kO/P5DB1EVTnMN8KnY6InxmVm1gqicQ=; b=pYytinO00byzst5d52Zs3hU3yFKgQ0RB1MBoab12FfRrIlUiwCRo5B3u1AHtn47dtX JYd5wvmuC5m/v3VI3PtjKlRc/Z0arv8D2zu4+ri53KGl5rxPk4MNNU71kGRJJInhTGLP KztEjVOnYyl/umE8blayzVIsuZUsHh2BWu7Mf78hcf4gq8hN0IJd+qUicOHeuwN3vOEY u4/Dz9ZGa3pp66laPwzGzQPUC2VQObM97WqC2Y8FmgbClzQVny+P/ZExuhRBpLy9kyKx +JVRhMxjHbF42xOrTpaVhZnXrfw6NPOcE/ndzwfDjpkJ7vjjQ+GC+XtAgy/0+Chdr6HW 1Uig== X-Gm-Message-State: AOAM532GQ2zp1NAJYjzH0hPAnZxfj4SSwjM7DoSGhf3xdh+t68PaJV+4 8tNxHlr+oRECMglhcdN0smYUfg== X-Received: by 2002:a05:600c:3794:: with SMTP id o20mr16425042wmr.0.1625583511015; Tue, 06 Jul 2021 07:58:31 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z4sm15754753wmf.9.2021.07.06.07.58.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 07:58:29 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2F8181FF9B; Tue, 6 Jul 2021 15:58:19 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 12/39] tests/docker: use explicit docker.io registry Date: Tue, 6 Jul 2021 15:57:50 +0100 Message-Id: <20210706145817.24109-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x333.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: fam@euphon.net, Thomas Huth , berrange@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , aurelien@aurel32.net 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é Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée Message-Id: <20210623142245.307776-5-berrange@redhat.com> Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/centos8.docker | 2 +- tests/docker/dockerfiles/debian-xtensa-cross.docker | 2 +- tests/docker/dockerfiles/debian10.docker | 2 +- tests/docker/dockerfiles/debian11.docker | 2 +- tests/docker/dockerfiles/ubuntu.docker | 2 +- tests/docker/dockerfiles/ubuntu1804.docker | 2 +- tests/docker/dockerfiles/ubuntu2004.docker | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) -- 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 \