diff options
| author | Mathieu Othacehe <othacehe@gnu.org> | 2021-12-16 10:09:17 +0100 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2021-12-23 10:54:00 +0100 |
| commit | 3ed8ddd606b5465bc502204f8a7fc4389ca9ab3f (patch) | |
| tree | 50740248ffe64f569ddfbfe0350402b4d27d65c8 /guix/scripts | |
| parent | 05a9d1f378e2e13e8f759be926ea368358afc27c (diff) | |
| download | guix-patches-3ed8ddd606b5465bc502204f8a7fc4389ca9ab3f.tar guix-patches-3ed8ddd606b5465bc502204f8a7fc4389ca9ab3f.tar.gz | |
scripts: system: Deprecate the docker-image command.
* guix/scripts/system.scm (system-derivation-for-action): Use the image API to
generate the docker images and deprecate the docker-image command.
(process-action): Ditto.
* doc/guix.texi (Invoking guix system): Adapt it.
Diffstat (limited to 'guix/scripts')
| -rw-r--r-- | guix/scripts/system.scm | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 1db788a534..a5d9bb4779 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -713,16 +713,14 @@ checking this by themselves in their 'check' procedure." image-size (* 70 (expt 2 20))) #:mappings mappings)) - ((image disk-image vm-image) + ((image disk-image vm-image docker-image) (when (eq? action 'disk-image) (warning (G_ "'disk-image' is deprecated: use 'image' instead~%"))) (when (eq? action 'vm-image) (warning (G_ "'vm-image' is deprecated: use 'image' instead~%"))) - (lower-object (system-image image))) - ((docker-image) - (system-docker-image os - #:memory-size 1024 - #:shared-network? container-shared-network?))))) + (when (eq? action 'docker-image) + (warning (G_ "'docker-image' is deprecated: use 'image' instead~%"))) + (lower-object (system-image image)))))) (define (maybe-suggest-running-guix-pull) "Suggest running 'guix pull' if this has never been done before." @@ -1214,11 +1212,14 @@ resulting from command-line parsing." (label (assoc-ref opts 'label)) (image-type (lookup-image-type-by-name (assoc-ref opts 'image-type))) - (image (let* ((image-type (if (eq? action 'vm-image) - qcow2-image-type - image-type)) + (image (let* ((image-type (case action + ((vm-image) qcow2-image-type) + ((docker-image) docker-image-type) + (else image-type))) (image-size (assoc-ref opts 'image-size)) (volatile? (assoc-ref opts 'volatile-root?)) + (shared-network? + (assoc-ref opts 'container-shared-network?)) (base-image (if (operating-system? obj) (os->image obj #:type image-type) @@ -1228,7 +1229,8 @@ resulting from command-line parsing." (image-with-label base-image label) base-image)) (size image-size) - (volatile-root? volatile?)))) + (volatile-root? volatile?) + (shared-network? shared-network?)))) (os (image-operating-system image)) (target-file (match args ((first second) second) |