diff options
author | Ludovic Courtès <ludo@gnu.org> | 2020-11-12 10:47:25 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2020-11-12 10:47:25 +0100 |
commit | 07914def98ca0d148e3522466227304e45286786 (patch) | |
tree | 71f265728ced786cb70de2a5654c9beb45eb77c5 /gnu/tests/docker.scm | |
parent | a13063d6ac7434beed1c608ce3eb6fb39c740b33 (diff) | |
parent | ef1107e2cca9a5b6f7129d019aabac2f0e89a238 (diff) | |
download | guix-patches-07914def98ca0d148e3522466227304e45286786.tar guix-patches-07914def98ca0d148e3522466227304e45286786.tar.gz |
Merge branch 'version-1.2.0'
Diffstat (limited to 'gnu/tests/docker.scm')
-rw-r--r-- | gnu/tests/docker.scm | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/gnu/tests/docker.scm b/gnu/tests/docker.scm index ea6c9a33fe..c70c3ddb9e 100644 --- a/gnu/tests/docker.scm +++ b/gnu/tests/docker.scm @@ -27,8 +27,9 @@ #:use-module (gnu services networking) #:use-module (gnu services docker) #:use-module (gnu services desktop) - #:use-module (gnu packages docker) + #:use-module ((gnu packages base) #:select (glibc)) #:use-module (gnu packages guile) + #:use-module (gnu packages docker) #:use-module (guix gexp) #:use-module (guix grafts) #:use-module (guix monads) @@ -206,7 +207,7 @@ inside %DOCKER-OS." ;; load' must be able to store the whole image into memory, hence the ;; huge memory requirements. We should avoid the volatile-root setup ;; instead. - (memory-size 3500) + (memory-size 4000) (port-forwardings '()))) (define test @@ -298,5 +299,9 @@ inside %DOCKER-OS." (description "Run a system image as produced by @command{guix system docker-image} inside Docker.") (value (with-monad %store-monad - (>>= (system-docker-image (simple-operating-system)) + (>>= (system-docker-image (operating-system + (inherit (simple-operating-system)) + ;; Use locales for a single libc to + ;; reduce space requirements. + (locale-libcs (list glibc)))) run-docker-system-test))))) |