From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 2Gb/JdXLIWCzFwAA0tVLHw (envelope-from ) for ; Mon, 08 Feb 2021 23:40:05 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id +G75IdXLIWCkAgAAB5/wlQ (envelope-from ) for ; Mon, 08 Feb 2021 23:40:05 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 0AF60940274 for ; Mon, 8 Feb 2021 23:40:05 +0000 (UTC) Received: from localhost ([::1]:53818 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9G8S-0005Xq-1Y for larch@yhetil.org; Mon, 08 Feb 2021 18:40:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56632) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9BWi-0007Xp-TK for guix-devel@gnu.org; Mon, 08 Feb 2021 13:44:48 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:37765) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l9BWh-0006dN-7z; Mon, 08 Feb 2021 13:44:48 -0500 Received: by mail-wm1-x329.google.com with SMTP id m1so109249wml.2; Mon, 08 Feb 2021 10:44:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:in-reply-to:references:date:message-id :mime-version; bh=ekcO1hURAUlm7ddmLUl8+IzCtZRq0cwuGs/H066rK8s=; b=GhPT/jAm7k060DG6K9a81s/czY4G3nmzhJkMYzWBbJb+ZyABiNFzoQpZl84dP9k0sd Rw7/9uoY581mOQ1Dqfw6099QGwauy3fqbOGa6XkXW6MS+F5Jz+/lZXVntKV8WCI4Do2D 0GYvxzZyMScAHdEfXvQ/6gaSrJ+Z+cDwnPL20Kz1s72nD2xSw4AhfX+evnOPQWud/Esq PImdvSk8p3XzP0VIbmktOeMPfJx0aezUJsQ/nKbmykSFzIblRZGmo49W+GF53EKr4Le/ 0uh1kkkkqcO9uSShaQuuPRBMjIzn8221a88HRdRZcDo9dRLuXoy4fAKpZBu4b6RxqWFW D8Zw== 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:in-reply-to:references:date :message-id:mime-version; bh=ekcO1hURAUlm7ddmLUl8+IzCtZRq0cwuGs/H066rK8s=; b=WBpcGkSIJYFpaTmcrN+m5ZrqM9RnpR0o6y46djpbCmhYbfJkteQD9d5crlbKpfhw8w TvQYZ5cOGaTK+ZkDcRZIuqDJZzWAmFn+Lgbt0BOOgxe1PyqmDI5zrO6WG0hDDShS7K8w rbGW1DOkHwNoeIjolE5ZCO7HBlOtcV9lERT1EUNjFv6DBPLsfnkIyU0bz9MfuDpIBIlS upqSJ3uWPr5R3/iNL+xP7nHxkJL7SPbo/VkoZoIJWKe2jl9nsDmwQPDBR+BL3epevXBc LzDMw8XuHHw3e/qg1aNcu3f/umQfw+oEsJj5XLcBhB/y3VmYPSOV8OtZTifcQVxh3ufD G1mw== X-Gm-Message-State: AOAM533XMZYbct0XxvzFch3S47he31oQxXzFve70nsDaSX5d689b0wfc Q7iNlQ7f6lZFOODVj//zhn/75lHuJUI= X-Google-Smtp-Source: ABdhPJzBfpss6oT1NB5ZVXFv0lO4Ctq4VtfV3x+VPoT0V0D39L6/G1c1jYplSpZtXra7Zx4CeS6+AQ== X-Received: by 2002:a05:600c:414b:: with SMTP id h11mr116797wmm.125.1612809884243; Mon, 08 Feb 2021 10:44:44 -0800 (PST) Received: from lili ([2a01:e0a:59b:9120:65d2:2476:f637:db1e]) by smtp.gmail.com with ESMTPSA id d9sm32371445wrq.74.2021.02.08.10.44.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 10:44:43 -0800 (PST) From: zimoun To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: [PATCH] Fix unreproducible =?utf-8?Q?=E2=80=9Cguix?= pack -f =?utf-8?Q?docker=E2=80=9D?= (hard link) In-Reply-To: <87k0rkzx75.fsf@gnu.org> References: <20210116182957.31075-1-ludo@gnu.org> <87wnvyv7w6.fsf@gnu.org> <86bldahz42.fsf@gmail.com> <8735ylm4zx.fsf@gnu.org> <86pn1jct3y.fsf@gmail.com> <877dnqe3to.fsf@gnu.org> <86eehycjre.fsf@gmail.com> <87im766d30.fsf@gnu.org> <86lfc2bfb1.fsf@gmail.com> <87k0rkzx75.fsf@gnu.org> Date: Mon, 08 Feb 2021 19:44:15 +0100 Message-ID: <86ft26l7r4.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=zimon.toutoune@gmail.com; helo=mail-wm1-x329.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, FREEMAIL_FROM=0.001, 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: guix-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: guix-devel Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: "Guix-devel" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -3.06 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20161025 header.b="GhPT/jAm"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (aspmx1.migadu.com: domain of guix-devel-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-devel-bounces@gnu.org X-Migadu-Queue-Id: 0AF60940274 X-Spam-Score: -3.06 X-Migadu-Scanner: scn1.migadu.com X-TUID: ICjCN50mSf+q --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi Ludo, On Sat, 06 Feb 2021 at 22:46, Ludovic Court=C3=A8s wrote: > Having looked at the tar manual (info "(tar) hard links"), it seems > clear that this is the default behavior and that we have to pass > =E2=80=98--hard-dereference=E2=80=99 to avoid it. Attached a patch that fixes the issue, I guess. Well, I am not sure to understand all correctly, yet. :-) Now the 2 images have the same checksum on my 2 machines. WDYT? Cheers, simon --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: inline; filename=0001-guix-docker-Fix-undeterministic-hard-link.patch Content-Transfer-Encoding: quoted-printable Content-Description: docker.patch >From 70e113ecccc831d2a111f7c8598157d41fe0de86 Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 8 Feb 2021 19:37:25 +0100 Subject: [PATCH] guix: docker: Fix undeterministic hard link. * guix/docker.scm (%tar-determinism-options): Add '--hard-dereference'. --- guix/docker.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guix/docker.scm b/guix/docker.scm index 97ac6d982b..39e85b7fc2 100644 --- a/guix/docker.scm +++ b/guix/docker.scm @@ -2,6 +2,7 @@ ;;; Copyright =C2=A9 2017 Ricardo Wurmus ;;; Copyright =C2=A9 2017, 2018, 2019 Ludovic Court=C3=A8s ;;; Copyright =C2=A9 2018 Chris Marusich +;;; Copyright =C2=A9 2021 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -112,7 +113,7 @@ Return a version of TAG that follows these rules." =20 (define %tar-determinism-options ;; GNU tar options to produce archives deterministically. - '("--sort=3Dname" "--mtime=3D@1" + '("--sort=3Dname" "--mtime=3D@1" "--hard-dereference" "--owner=3Droot:0" "--group=3Droot:0")) =20 (define directive-file base-commit: 4cd8bab7d4b345c5538b8d039d84a957df7a235f --=20 2.29.2 --=-=-=--