diff options
| -rw-r--r-- | guix/docker.scm | 5 | ||||
| -rw-r--r-- | guix/scripts/pack.scm | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/guix/docker.scm b/guix/docker.scm index 60ce13cbde..bb6d896a63 100644 --- a/guix/docker.scm +++ b/guix/docker.scm @@ -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 diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index 7ab2c0d447..857cb46af3 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -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) |