From patchwork Sat May 24 16:55:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ray Miller X-Patchwork-Id: 42903 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A7D6127BC49; Sat, 24 May 2025 18:28:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5DDB527BC4C for ; Sat, 24 May 2025 18:28:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uIsfH-0004Q7-4x; Sat, 24 May 2025 13:28:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uIsfD-0004Le-Ag for guix-patches@gnu.org; Sat, 24 May 2025 13:28:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uIsfD-0008Ff-1E for guix-patches@gnu.org; Sat, 24 May 2025 13:28:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=In-Reply-To:From:References:MIME-Version:Date:To:Subject; bh=De8VTZ5gpdVL0MRhYgyPFL3+LKkPBQFfS8zUaxLC0Ho=; b=o8lqUPyGbSx2wewipM76/CZAF2OOiRhZcECJMdiZJeyfqiUGAkbG1lgO3frMXTM3YDosvKJDsA4vgeBiOcqvIi0LBOSnndFlm7Kzqwi9LlqwY+98bFHkZP2OH5u1zIv33uCiMBRdGqhzQruDOUy5DaQZDn+LimDXYi534wajHlIVZrHdiZq5W9ZaDr+m5hPdmhCseZItIL628BS0HSlT7BdWv9oXgZkZDAgW2/CtCAD41SGKXmaGuxMsl2KJ/4nqaFRWCJZHacJSGzE3xFRq37q66/UeZUN9Ku75BYl0j2m9uOzhfQwof3mYmGwAp8p+RmAIfRKdOACasV3vD8PX0g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uIsfC-00038M-QI for guix-patches@gnu.org; Sat, 24 May 2025 13:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78210] [PATCH] guix: include store parent dirs in docker layer Resent-From: Ray Miller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 24 May 2025 17:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78210 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78210@debbugs.gnu.org Received: via spool by 78210-submit@debbugs.gnu.org id=B78210.174810767211994 (code B ref 78210); Sat, 24 May 2025 17:28:02 +0000 Received: (at 78210) by debbugs.gnu.org; 24 May 2025 17:27:52 +0000 Received: from localhost ([127.0.0.1]:34971 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uIsf0-000379-WF for submit@debbugs.gnu.org; Sat, 24 May 2025 13:27:52 -0400 Received: from mx2.mythic-beasts.com ([2a00:1098:0:82:1000:0:2:1]:35203) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uIs9U-0000A4-5T for 78210@debbugs.gnu.org; Sat, 24 May 2025 12:55:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=1729.org.uk ; s=mythic-beasts-k1; h=From:To:Subject:Date; bh=De8VTZ5gpdVL0MRhYgyPFL3+LKkPBQFfS8zUaxLC0Ho=; b=K72yjP585QYnaKwbvdC1kcqaMG V+a7fJbqf/7S/2Jjb3mw9lIEukMCatPX4WBHXensx7vGmXqLQKAXM/yMGHjoX7e2tpv25UVarDGhz jc4Z/HAF0kPPwMhpaS8E/AclFXODYtowejFsSvYbxT7e/wQtMV28O8EScSzJDj/KAkClkwKsQqhkn Qf51CE3ot5p1ndtmCjALCyeWZ96x3vYRLU2xx4I0PbTBF+jB18fxxfNTKS5WI7pv+cPH7iqvxQQL4 fDfQj58zxRLXM5OSHhgPoKw/Z5UkC0R2yOXxpZqfXQaAcPSw2SIhmwacJ8x/gWFUpiYbmIqO0U/yA c545e5vA==; Received: by mailhub-hex-d.mythic-beasts.com with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1uIs9O-00FV8P-0g for 78210@debbugs.gnu.org; Sat, 24 May 2025 17:55:10 +0100 Message-ID: <23550b3b-f732-4869-99a5-cbcad868736c@1729.org.uk> Date: Sat, 24 May 2025 17:55:09 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird References: <87ecwllkts.fsf@gnu.org> Content-Language: en-GB Autocrypt: addr=ray@1729.org.uk; keydata= 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 2t+Hmx6pMM4p4nZqbaVURAcyHvI= In-Reply-To: <87ecwllkts.fsf@gnu.org> X-BlackCat-Spam-Score: 0 X-Mailman-Approved-At: Sat, 24 May 2025 13:27:49 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Ray Miller X-ACL-Warn: , Ray Miller via Guix-patches X-Patchwork-Original-From: Ray Miller via Guix-patches via From: Ray Miller Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/scripts/pack.scm: add store directory to the docker layer. * guix/docker.scm: change order of arguments to tar so parent directories are added before their contents. Fixes Change-Id: I2b103c59981e828c965564ccc5d2415b00a7e52e --- guix/docker.scm       | 4 ++-- guix/scripts/pack.scm | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-)             (use-modules (guix docker) (guix build store-copy) @@ -580,9 +581,10 @@ (define* (docker-image name profile                      (,source -> ,target))))))             (define directives -              ;; Create a /tmp directory, as some programs expect it, and -              ;; create SYMLINKS. +              ;; Create /tmp and %store-prefix directories, as some +              ;; programs expect them, and create SYMLINKS.               `((directory "/tmp" ,(getuid) ,(getgid) #o1777) +                (directory #$(%store-prefix) ,(getuid) ,(getgid) #o755)                 ,@(append-map symlink->directives '#$symlinks)))             (define (form-entry-point prefix entry-point entry-point-argument) base-commit: 096dedd0bb13523002c814b001429c2f65b6f10d diff --git a/guix/docker.scm b/guix/docker.scm index 60ce13cbde..9911bb84bb 100644 --- a/guix/docker.scm +++ b/guix/docker.scm @@ -365,10 +365,10 @@ (define* (build-docker-image image paths prefix                 (apply invoke "tar" "-cf" "../layer.tar"                        `(,@transformation-options                          ,@(tar-base-options) -                         ,@(if max-layers '() paths)                          ,@(scandir "."                                     (lambda (file) -                                      (not (member file '("." "..")))))))) +                                      (not (member file '("." ".."))))) +                         ,@(if max-layers '() paths))))               (delete-file-recursively "extra")))         ;; It is possible for "/" to show up in the archive, especially when diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index 7ab2c0d447..9c14b7bd81 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -551,7 +551,8 @@ (define* (docker-image name profile                                     (guix build store-copy)                                     (guix build utils) ;for %xz-parallel-args                                     (guix profiles) -                                    (guix search-paths)) +                                    (guix search-paths) +                                    (guix store))                                   #:select? not-config?))         #~(begin