me/guix
Archived
1
0
Fork 0
Code Activity

services: oci-container: Fix provided image is string.

Browse source 
gnu/services/docker.scm (oci-container-shepherd-service): When image is
oci-image, call %oci-image-loader.

Change-Id: I26105e82643affe9e7037975e42ec9690089545b
This commit is contained in:
Zheng Junjie 2024-05-27 13:53:01 +08:00
parent 425cf1fbe2
commit 2b2337f275
No known key found for this signature in database
GPG key ID: 3B5AA993E1A2DFF0
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
gnu/services/docker.scm
View file

@ -687,18 +687,19 @@ operating-system, gexp or file-like records but ~a was found")
(if (oci-image? image) name image) ".")) (if (oci-image? image) name image) "."))
(start (start
#~(lambda () #~(lambda ()
(when #$(oci-image? image) #$@(if (oci-image? image)
(invoke #$(%oci-image-loader #~((invoke #$(%oci-image-loader
name image image-reference))) name image image-reference)))
(fork+exec-command #~())
;; docker run [OPTIONS] IMAGE [COMMAND] [ARG...] (fork+exec-command
(list #$docker "run" "--rm" "--name" #$name ;; docker run [OPTIONS] IMAGE [COMMAND] [ARG...]
#$@options #$@extra-arguments (list #$docker "run" "--rm" "--name" #$name
#$image-reference #$@command) #$@options #$@extra-arguments
#:user #$user #$image-reference #$@command)
#:group #$group #:user #$user
#:environment-variables #:group #$group
(list #$@host-environment)))) #:environment-variables
(list #$@host-environment))))
(stop (stop
#~(lambda _ #~(lambda _
(invoke #$docker "rm" "-f" #$name))) (invoke #$docker "rm" "-f" #$name)))