linux-container: Do not add %CONTAINER-FILE-SYSTEMS to Docker image OSes.
authorLudovic Courtès <ludo@gnu.org>
Fri, 10 May 2019 16:16:45 +0000 (18:16 +0200)
committerLudovic Courtès <ludo@gnu.org>
Wed, 15 May 2019 14:36:21 +0000 (16:36 +0200)
commit6edd5c546c7c1bb5ee45436a0441a9daf1e5509c
treedf58794499e3ba22c85bff5192fe3fd76d4cedc5
parent32747aa987bd921bc8aadc1c1d4b4da6d9bcc306
linux-container: Do not add %CONTAINER-FILE-SYSTEMS to Docker image OSes.

Previously, 'guix system docker-image' would end up providing an OS that
would try to mount all of %CONTAINER-FILE-SYSTEMS as well as /gnu/store,
which is bound to fail in unprivileged Docker.

This patch makes it so that 'guix system container' still gets those
file systems, but 'guix system docker-image' doesn't.

* gnu/system/linux-container.scm (containerized-operating-system): Add
 #:extra-file-systems parameter and honor it.  Do not include
 %STORE-MAPPING and SHARED-NETWORK-FILE-MAPPINGS.
(container-script): Add %STORE-MAPPING and optionally NETWORK-MAPPINGS
to MAPPINGS and pass #:extra-file-systems.
gnu/system/linux-container.scm