summaryrefslogtreecommitdiff
path: root/guix/scripts/pack.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-03-16 22:40:06 +0100
committerLudovic Courtès <ludo@gnu.org>2017-03-16 22:50:15 +0100
commit9e84ea3673f77ebe5c5e9ce39fbcdb6d7bc8a06f (patch)
tree3263caf2d4ed8c019eeb97d9ff9da108bdb6acf2 /guix/scripts/pack.scm
parent54241dc8e62c8616dcd72effe816e6e570607055 (diff)
pack: Honor symlinks in the Docker back-end.
* guix/docker.scm (symlink-source, topmost-component): New procedures. (build-docker-image): Add #:symlinks parameter and honor it. Remove hard-coded /bin symlink. * guix/scripts/pack.scm (docker-image): Pass #:symlinks to 'build-docker-image'.
Diffstat (limited to 'guix/scripts/pack.scm')
-rw-r--r--guix/scripts/pack.scm3
1 files changed, 2 insertions, 1 deletions
diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm
index 694b2f2aee..edeb82fafd 100644
--- a/guix/scripts/pack.scm
+++ b/guix/scripts/pack.scm
@@ -189,7 +189,7 @@ added to the pack."
"Return a derivation to construct a Docker image of PROFILE. The
image is a tarball conforming to the Docker Image Specification, compressed
with COMPRESSOR. It can be passed to 'docker load'."
- ;; FIXME: Honor SYMLINKS and LOCALSTATEDIR?.
+ ;; FIXME: Honor LOCALSTATEDIR?.
(define not-config?
(match-lambda
(('guix 'config) #f)
@@ -227,6 +227,7 @@ with COMPRESSOR. It can be passed to 'docker load'."
(build-docker-image #$output #$profile
#:closure "profile"
+ #:symlinks '#$symlinks
#:compressor '#$(compressor-command compressor)
#:creation-time (make-time time-utc 0 1)))))