diff options
| author | Chris Marusich <cmmarusich@gmail.com> | 2018-03-15 05:09:13 +0100 |
|---|---|---|
| committer | Chris Marusich <cmmarusich@gmail.com> | 2018-03-24 03:04:10 +0100 |
| commit | 1c2ac6b482ea20419e57fd54b0cd1d4d3972776b (patch) | |
| tree | 59837443069c8d3ba769d920079dd451a2eaabda /guix/scripts/pack.scm | |
| parent | 8c9bf2946a1cb58c5b7b941db3a37830ece80708 (diff) | |
| download | guix-patches-1c2ac6b482ea20419e57fd54b0cd1d4d3972776b.tar guix-patches-1c2ac6b482ea20419e57fd54b0cd1d4d3972776b.tar.gz | |
guix: Rewrite build-docker-image to allow more paths.
* guix/docker.scm (build-docker-image): Rename "path" argument to
"prefix" to reflect the fact that it is used as a prefix for the
symlink targets. Add the "paths" argument, and remove the "closure"
argument, since it is now redundant. Add a "transformations"
argument.
* guix/scripts/pack.scm (docker-image): Read the profile's reference
graph and provide its paths to build-docker-image via the new "paths"
argument.
Diffstat (limited to 'guix/scripts/pack.scm')
| -rw-r--r-- | guix/scripts/pack.scm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index 0ec1ef4d24..488638adc5 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -238,6 +238,7 @@ the image." (define build (with-imported-modules `(,@(source-module-closure '((guix docker)) #:select? not-config?) + (guix build store-copy) ((guix config) => ,config)) #~(begin ;; Guile-JSON is required by (guix docker). @@ -245,13 +246,15 @@ the image." (string-append #+json "/share/guile/site/" (effective-version))) - (use-modules (guix docker) (srfi srfi-19)) + (use-modules (guix docker) (srfi srfi-19) (guix build store-copy)) (setenv "PATH" (string-append #$tar "/bin")) - (build-docker-image #$output #$profile + (build-docker-image #$output + (call-with-input-file "profile" + read-reference-graph) + #$profile #:system (or #$target (utsname:machine (uname))) - #:closure "profile" #:symlinks '#$symlinks #:compressor '#$(compressor-command compressor) #:creation-time (make-time time-utc 0 1))))) |