~ruther/guix-local: pack: Include store parent directories in the Docker layer.

b48b2bcf421b0a630e9b07378854e52618e8e773 — Ray Miller 1 year, 9 days ago ef3b963

pack: Include store parent directories in the Docker layer.

Fixes <https://issues.guix.gnu.org/78210>.

This patch adds the /gnu and /gnu/store directories to the Docker layer
created by ‘guix pack -f docker …’, which enables the Docker image to be
used to create an AWS Lambda function.  Without the patch, creating the
AWS Lambda function fails with this error:

  "MissingParentDirectory: Parent directory does not exist for file: gnu/store/…-info-dir/"

* guix/scripts/pack.scm (docker-image)[build]: Add store directory to
the docker layer.
* guix/docker.scm (build-docker-image): Change order of arguments to
‘tar’ so parent directories are added before their contents.

Change-Id: I2b103c59981e828c965564ccc5d2415b00a7e52e
Signed-off-by: Ludovic Courtès <ludo@gnu.org>

patch browse .tar.gz

2 files changed, 6 insertions(+), 4 deletions(-)

M guix/docker.scm
M guix/scripts/pack.scm

M guix/docker.scm => guix/docker.scm +3 -2

@@ 365,10 365,11 @@ added to image as a layer."
                 (apply invoke "tar" "-cf" "../layer.tar"
                        `(,@transformation-options
                          ,@(tar-base-options)
-                         ,@(if max-layers '() paths)
+                         ;; Add parent directories before their contents.
                          ,@(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

M guix/scripts/pack.scm => guix/scripts/pack.scm +3 -2

@@ 580,9 580,10 @@ layers."
                      (,source -> ,target))))))
 
             (define directives
-              ;; Create a /tmp directory, as some programs expect it, and
-              ;; create SYMLINKS.
+              ;; Create the /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)