diff options
| author | Marius Bakke <marius@gnu.org> | 2020-11-15 23:45:34 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-11-15 23:45:34 +0100 |
| commit | 4e5e05d40908e9f1336ffc5a6c4928ab61ad034c (patch) | |
| tree | ad6d6be0ece396ba3353871a5691e514253508f8 /gnu/tests/docker.scm | |
| parent | 2c400ae94207b3b84fcdcaa21c122076c050d307 (diff) | |
| parent | e1fa3ea9fe8d01dd124c5e304bde9243876378ba (diff) | |
| download | guix-4e5e05d40908e9f1336ffc5a6c4928ab61ad034c.tar guix-4e5e05d40908e9f1336ffc5a6c4928ab61ad034c.tar.gz | |
Merge branch 'master' into staging
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))))) |