diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-07-31 14:28:56 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-07-31 14:28:56 +0200 |
| commit | 6a2e54236e1b2c428c8fd478ee0f3bd8130703fa (patch) | |
| tree | af70155a2f474d35d90d003f8584b2d9ee0bbaa8 /guix/docker.scm | |
| parent | 2cf1e37c109c8d03fae75bc84f7012f3afa956e5 (diff) | |
| parent | 3d88855dfdcc4c8ce11f494fdf9f0ac1d8eef530 (diff) | |
| download | guix-patches-6a2e54236e1b2c428c8fd478ee0f3bd8130703fa.tar guix-patches-6a2e54236e1b2c428c8fd478ee0f3bd8130703fa.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/docker.scm')
| -rw-r--r-- | guix/docker.scm | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/guix/docker.scm b/guix/docker.scm index b1bd226fa1..c598a073f6 100644 --- a/guix/docker.scm +++ b/guix/docker.scm @@ -62,9 +62,9 @@ (define (manifest path id) "Generate a simple image manifest." - `(((Config . "config.json") - (RepoTags . (,(generate-tag path))) - (Layers . (,(string-append id "/layer.tar")))))) + `#(((Config . "config.json") + (RepoTags . #(,(generate-tag path))) + (Layers . #(,(string-append id "/layer.tar")))))) ;; According to the specifications this is required for backwards ;; compatibility. It duplicates information provided by the manifest. @@ -81,17 +81,18 @@ `((architecture . ,arch) (comment . "Generated by GNU Guix") (created . ,time) - (config . ,`((env . ,(map (match-lambda - ((name . value) - (string-append name "=" value))) - environment)) + (config . ,`((env . ,(list->vector + (map (match-lambda + ((name . value) + (string-append name "=" value))) + environment))) ,@(if entry-point - `((entrypoint . ,entry-point)) + `((entrypoint . ,(list->vector entry-point))) '()))) (container_config . #nil) (os . "linux") (rootfs . ((type . "layers") - (diff_ids . (,(layer-diff-id layer))))))) + (diff_ids . #(,(layer-diff-id layer))))))) (define %tar-determinism-options ;; GNU tar options to produce archives deterministically. |