me
/
guix
Archived
1
0
Fork 0
Code

pack: Create /tmp in Docker images. 

Fixes <https://bugs.gnu.org/37161>.

* guix/scripts/pack.scm (docker-image)[build]: Add a 'directory' entry
for "/tmp" to DIRECTIVES.
* tests/pack.scm ("docker-image + localstatedir"): Test the presence of /tmp.
* gnu/tests/docker.scm (run-docker-test)["Load docker image and run
it"]: Test the presence and permission bits of "/tmp".
master
Ludovic Courtès 2019-08-27 11:27:02 +02:00 committed by Ludovic Courtès
parent 2b7c89f4fc
commit 7979a287f8
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gnu/tests/docker.scm
View File

@ -100,7 +100,7 @@ inside %DOCKER-OS."
marionette))
(test-equal "Load docker image and run it"
'("hello world" "hi!" "JSON!")
'("hello world" "hi!" "JSON!" #o1777)
(marionette-eval
`(begin
(define slurp
@ -131,8 +131,15 @@ inside %DOCKER-OS."
,(string-append #$docker-cli "/bin/docker")
"run" repository&tag
"-c" "(use-modules (json))
(display (json-string->scm (scm->json-string \"JSON!\")))")))
(list response1 response2 response3)))
(display (json-string->scm (scm->json-string \"JSON!\")))"))
;; Check whether /tmp exists.
(response4 (slurp
,(string-append #$docker-cli "/bin/docker")
"run" repository&tag "-c"
"(display (stat:perms (lstat \"/tmp\")))")))
(list response1 response2 response3
(string->number response4))))
marionette))
(test-end)

6
guix/scripts/pack.scm
View File

@ -511,8 +511,10 @@ the image."
(,source -> ,target))))))
(define directives
;; Fully-qualified symlinks.
(append-map symlink->directives '#$symlinks))
;; Create a /tmp directory, as some programs expect it, and
;; create SYMLINKS.
`((directory "/tmp" ,(getuid) ,(getgid) #o1777)
,@(append-map symlink->directives '#$symlinks)))
(setenv "PATH" (string-append #$archiver "/bin"))

1
tests/pack.scm
View File

@ -169,6 +169,7 @@
(when
(and (file-exists? (string-append bin "/guile"))
(file-exists? "var/guix/db/db.sqlite")
(file-is-directory? "tmp")
(string=? (string-append #$%bootstrap-guile "/bin")
(pk 'binlink (readlink bin)))
(string=? (string-append #$profile "/bin/guile")