From patchwork Tue Jul 7 07:08:38 2020 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: 234944 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp661620ilg; Tue, 7 Jul 2020 00:26:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyQLbbCd9hrsIzYR8hbwnXpdVpkvMjcZ4lyjz3uvSHDMVIxY83oxMa/JNrsUeWH8T/3xhU1 X-Received: by 2002:a25:d1cf:: with SMTP id i198mr40816929ybg.23.1594106786436; Tue, 07 Jul 2020 00:26:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594106786; cv=none; d=google.com; s=arc-20160816; b=n1sNlfXFxMGrrQbdYZRPvGgaSHBYYk8UCTa3yEMQyDnyn+woxrgSBeXzKIzoVIqhHu QXC9Wm4cDIV0QoFcRQv8pjV68RgBEfezasXLKkfRMOhyh0Hb1+6B0rv6XsYiVbLpemjw OubKgssNZwvua8K+ORYALHqUX2y8keJMNJzqV9jwIuExIsvPp65kiBJbG4IDCahzqXAc 2QUz8IRoLJa3XI8PxGtkxGrQwruXEikyZ1RgFIk6ZD00Lpks51ncSLfrNayc8UT0IPws s5whZbcDB34El17fQSLD0BlPowYehtv7opivumCtXFpfuFObAuMSNWtF/L/rpCQ3U9v1 2XVQ== 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=YO+flFf+2yJ5JAaqokF7PDcUOrzGxTLuTO5KQlNjjuo=; b=qG79k2WvruFol3xtLreXRq79al8ktyouCsLTXPmTO3iDqqvoMdW5/Wr1FAkvdtv5Tj u3dsgU9svWBS23zr4YG9tlSduHokQuD53Cjq64jbpereDGA3z0ufCvuGOAPIPgTCfbGo 0wzcVvPng+/Y44mCfqNkSTonosiGkBJfY1r2Uvnovp8Z39VLyHrvXu1e1o7xGQTrXON5 2vTNAvotuqh3zLo3Rz3CZh20fSrDW/FBVvRCsthqUH49QSgyLXMtUYxLWqglYakCcTj+ vZVP/rVjC1IR/n+vG7kc9tV9FuorD3bk7J6U4wWNYVuKZF619++RYQ8Fh2ZXjGzA9IKz tmnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=luhIICYQ; 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 p202si21435237ybc.482.2020.07.07.00.26.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 07 Jul 2020 00:26:26 -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=luhIICYQ; 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]:57072 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jshzl-0004OL-Tc for patch@linaro.org; Tue, 07 Jul 2020 03:26:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45882) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jshxr-0001Tr-D0 for qemu-devel@nongnu.org; Tue, 07 Jul 2020 03:24:27 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:42490) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jshxo-0006fx-Tv for qemu-devel@nongnu.org; Tue, 07 Jul 2020 03:24:27 -0400 Received: by mail-wr1-x42f.google.com with SMTP id o11so44048378wrv.9 for ; Tue, 07 Jul 2020 00:24:24 -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=YO+flFf+2yJ5JAaqokF7PDcUOrzGxTLuTO5KQlNjjuo=; b=luhIICYQJVM69XdfZZPLZIIyZcWs7GLRG9Y5ZAsStsAwji0nvEajCF1b65J0s4Jdu1 sV4kW/4uDDRP4NUCd7VZQaGqwTG5imA5HDnkQsnot9aLkMLT2WRPMv7rS/iYmRHPnQhJ oCPeFypEIAqE8l1ojsux9Tw5XDGrp8tuJhrsSvndQJz1WvW7LRSDanVPBdQ9+ij5gKCT jTFykhjZdXHlx0UdXXS60z5mtSEBjcr9CEDl1+Fx2C80ra8XUqo6DHfaR3AY3ug/eag+ OHBexttdjoo4x3+I6uAx9dyWEWTGNrawOAH0PeTQNbUbr7voGu8T/8EJRO5AaMZL/n/x h/Bw== 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=YO+flFf+2yJ5JAaqokF7PDcUOrzGxTLuTO5KQlNjjuo=; b=sgKO0hnf04kRKQsD2pMRrw+TCCuT/xxeN0Flz028kNjXGE/YkiIdf3oOIwrPhMAje9 f2GHmNdPQs82u2Azwuxy3l8ZUKd3F65oEk41cFpOchOY5XG+zAclXGkSCN2q6Cx8H6/B jGW/TDlYYDpfL8jiszGEUjT5HnswOt9iDWv1YdXwUEOpG33Ku62lq7t64fYRowXIS7xD hxteGBSif4EWQinr7r93zno8DDKTGY2Ba0gPxmMK6xm1ukJOfebc7UXC1hd8MDCrNScO 0xwL2GxDIqrAKGmqh3+8ixnpsj6IqURqorvpzp+LgIthWbS3kh4pEivV5UZ0b5c/LKdi OzeA== X-Gm-Message-State: AOAM531uJJfuLLoqXr6yNYCkq1kTwcURzHKk5CMY8iaoYFgCorplvVy4 mKeb8xCL6l0krp/dvuaA8kQQaw== X-Received: by 2002:a5d:688d:: with SMTP id h13mr17459418wru.303.1594106663631; Tue, 07 Jul 2020 00:24:23 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 22sm2386322wmb.11.2020.07.07.00.24.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jul 2020 00:24:21 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A811A1FF87; Tue, 7 Jul 2020 08:09:00 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 21/41] gitlab: build containers with buildkit and metadata Date: Tue, 7 Jul 2020 08:08:38 +0100 Message-Id: <20200707070858.6622-22-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200707070858.6622-1-alex.bennee@linaro.org> References: <20200707070858.6622-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42f.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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=_AUTOLEARN 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: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" According to the documentation to be able to use --cache-from for remote registries you need to enable both buildkit and inline the metadata. We want to do this to support pulling from gitlab when users build their local docker images. Signed-off-by: Alex Bennée Message-Id: <20200701135652.1366-24-alex.bennee@linaro.org> -- 2.20.1 diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index 2afd01f1d179..f353359fd8ba 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -11,7 +11,9 @@ script: - docker pull "$TAG" || docker pull "$COMMON_TAG" || true - sed -i -e "s,FROM qemu/,FROM $CI_REGISTRY_IMAGE/qemu/," tests/docker/dockerfiles/$NAME.docker - - docker build --cache-from "$TAG" --cache-from "$COMMON_TAG" --tag "$TAG" -f "tests/docker/dockerfiles/$NAME.docker" tests/docker/dockerfiles + - DOCKER_BUILDKIT=1 docker build --cache-from "$TAG" --cache-from "$COMMON_TAG" --tag "$TAG" + --build-arg BUILDKIT_INLINE_CACHE=1 + -f "tests/docker/dockerfiles/$NAME.docker" tests/docker/dockerfiles - docker push "$TAG" after_script: - docker logout