From patchwork Wed Jul 1 13:56:35 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: 192159 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp532007ilg; Wed, 1 Jul 2020 07:12:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyPqahtmJnXPhrjf0aATX321NXIdBaIEE2dzQuCGetrtiNwpfQdVrZ0m+NtiFbDLzyrrfyY X-Received: by 2002:a05:6214:10e5:: with SMTP id q5mr25666058qvt.47.1593612769655; Wed, 01 Jul 2020 07:12:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593612769; cv=none; d=google.com; s=arc-20160816; b=MW3yIGuT+qPKdS1hktcxyak2RPXegF6AFKkkON2OoYr4dg1vSEBrq2bqzrYmKR/7Wg zlwn12L9Zb0fmY6fSSQRY9CreH1U/uOy269xaKY0TaYErq0hlTNTQUA5fsEsjx7QYtsD N+K/yhBCqtutDdbeQWsI2vV4F3tko8pcVSX+5Sm5fs+tn1+SqtAMI4CVAD3RCaEZ1vGs TU45xQMZ9zglSSe3YqmAhLacl4dmjqfeG95U9jZ4UsxzBbg4cbA45bhRwgSKavj9S2Ot Oezx76uVA8AVTmEYBoygVLzJdzBiD/Itc7k5EjJ37NneEefX4rvcIsye3Fd82qm75iBF HUEg== 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=TNPsrLyF7lXSFi67XMppVcIlDb8Jop3OMsLkQ8Zh/L0=; b=OASaq+kSbp1S4v9rZEXSTnYbtef8+PHr45xUWg9gA3BKRRvgiJKINrJbCkYV1I0wY/ TJbsUw1zhnkoqMY0loEEMGrAzuflFs1fdwUC5r4SMpHzilYn5NiN7vL+rZvdz2vTEBdc PZ5O6PzdX7V0aRPSImgA1Y2AQhj5DG4MrwfT+xol+PiP3MLiFDly0NMp+USE8g1a0QJP rgnGl1SHn1+RvOEKm71CrkgLh9mYMLNLg8n58mqQLEvjf7gcyvW7a+/z6ylt3is0sKtb nIiYH6YpaeD/wBjpsTMM637Jgv9EzHJHZdk588B+YpmqGRO4hWhF1YVqc2iPP0mtgHrI 9rNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=wxl4gecI; 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 l56si4256924qtc.273.2020.07.01.07.12.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Jul 2020 07:12:49 -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=wxl4gecI; 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]:33208 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqdTl-0003k1-3F for patch@linaro.org; Wed, 01 Jul 2020 10:12:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59124) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdEo-0002af-Qg for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:22 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:34376) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdEh-0005tA-8q for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:22 -0400 Received: by mail-wm1-x343.google.com with SMTP id g10so6888266wmc.1 for ; Wed, 01 Jul 2020 06:57:13 -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=TNPsrLyF7lXSFi67XMppVcIlDb8Jop3OMsLkQ8Zh/L0=; b=wxl4gecImMJT4THqkLYBACUbfKIZwB++ODONQkyqLDLENty9DzcVnMc4zxOo2CCPxn aJc14UHBUYQE8DVUPkzSrcTr2TMvfh+ysCqkBYgVPTthLELR84WzvrKtVWO5pkOE9Vot q8E744gVxYZdKsldP47c8lL5seuP8L7VGJvjzJpf3wrFd0jUK+uacvetIy0ZynmHz8Ie pqEO2UATz9jeUNhAd6GEbkkzdOkpSefXin5r2gne8VJbkuN6Pzn5URNTX6cCBAwnafC3 zF1TSNYiPjsDxhdeCmZf2yNcuIb+nzMmrQqvhW0Zddj/PdO49B8cLi6a5wx8sC0woqMe CdrQ== 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=TNPsrLyF7lXSFi67XMppVcIlDb8Jop3OMsLkQ8Zh/L0=; b=eV46P/iYZ7bdg57MrcnS60zYo6XY96ZEaUwaG/BHWZAOf83wXADzOGqqziFNGGM7X3 bfRtERRgn3x+FWYeeurIrqsAHo2Qj7Ma3MvM6vzcpZafrAnZuDyFMR+jq+eXBaOTC7Jq HIFiVWS0VH+pw10ORT5UiF3FmWaaneY+QXQAMQw3yjVNeoJzyCzpO1P8zRa/+w5/0H1U wqx/M0vuixP6//BzwciYm08HbKkW6fg9ExHHqYzcmUEMcJUpYc44QdHMrwG9XH7olJh7 WMqCGMgWI5WNR3RI2SJ/TE91lBB4LiRlQMezYoQCfg6REMbv/2+w1ew3Wxe0HIgiFSAS xKIQ== X-Gm-Message-State: AOAM5336D8aAL+lfphXslOlv4uVB5p6lw9aA0MZzyTklEEddO3tj3e8W Zy05QmuVpEdKjknqRSH9QWpSfw== X-Received: by 2002:a1c:f616:: with SMTP id w22mr27898939wmc.155.1593611833023; Wed, 01 Jul 2020 06:57:13 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 1sm7109422wmf.21.2020.07.01.06.57.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 06:57:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 46B371FFAC; Wed, 1 Jul 2020 14:56:55 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 23/40] gitlab: build containers with buildkit and metadata Date: Wed, 1 Jul 2020 14:56:35 +0100 Message-Id: <20200701135652.1366-24-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::343; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x343.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: fam@euphon.net, berrange@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, cota@braap.org, aurelien@aurel32.net 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 --- .gitlab-ci.d/containers.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.20.1 diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index 2afd01f1d17..f353359fd8b 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