From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:50834) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hP53J-0001ZY-BZ for guix-patches@gnu.org; Fri, 10 May 2019 08:55:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hP53G-0008Kq-Aw for guix-patches@gnu.org; Fri, 10 May 2019 08:55:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52106) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hP53F-0008JY-R4 for guix-patches@gnu.org; Fri, 10 May 2019 08:55:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hP53F-0007K8-LP for guix-patches@gnu.org; Fri, 10 May 2019 08:55:01 -0400 Subject: [bug#28128] [PATCH 2/2] scripts: system: Support container network sharing. Resent-Message-ID: From: Arun Isaac In-Reply-To: References: <20190313093610.1071-1-arunisaac@systemreboot.net> <20190313093610.1071-3-arunisaac@systemreboot.net> <87va0n80u5.fsf@gnu.org> <874l80tw60.fsf@gnu.org> <871s2y7r71.fsf@inria.fr> Date: Fri, 10 May 2019 18:24:14 +0530 Message-ID: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 28128@debbugs.gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain I took too long, but here it is finally! Should I add any documentation about this new -N option to the manual? --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-linux-container-Add-support-for-container-network-sh.patch Content-Transfer-Encoding: quoted-printable From=20d5f6fb996f591c44d94fe578a5c41a830ddcb077 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Fri, 10 May 2019 16:56:16 +0530 Subject: [PATCH] linux-container: Add support for container network sharing. * gnu/system/linux-container.scm (container-essential-services): If network= is to be shared with the host, remove network configuration files from etc service. (containerized-operating-system): If network is to be shared with the host, remove nscd service and map host's /var/run/nscd if it exists. (container-script): If network is to be shared with the host, do not create network namespace. * guix/scripts/system.scm (system-derivation-for-action): Add (perform-action): Add #:container-shared-network? argument. (show-help): Add "-N, --network" help information. (%options): Add network option. (process-action): Call perform-action with #container-shared-network? argum= ent. Co-authored-by: Christopher Baines =2D-- gnu/system/linux-container.scm | 63 ++++++++++++++++++++++++++++------ guix/scripts/system.scm | 20 +++++++++-- 2 files changed, 70 insertions(+), 13 deletions(-) diff --git a/gnu/system/linux-container.scm b/gnu/system/linux-container.scm index 149c3d08a3..da0fd040f9 100644 =2D-- a/gnu/system/linux-container.scm +++ b/gnu/system/linux-container.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2015 David Thompson ;;; Copyright =C2=A9 2016, 2017, 2019 Ludovic Court=C3=A8s +;;; Copyright =C2=A9 2019 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -35,7 +36,7 @@ containerized-operating-system container-script)) =20 =2D(define (container-essential-services os) +(define* (container-essential-services os #:key shared-network?) "Return a list of essential services corresponding to OS, a non-containerized OS. This procedure essentially strips essential services from OS that are needed on the bare metal and not in a container." @@ -51,9 +52,20 @@ from OS that are needed on the bare metal and not in a c= ontainer." (let ((locale (operating-system-locale-directory os))) (with-monad %store-monad (return `(("locale" ,locale)))))) =2D base)) + ;; If network is to be shared with the host, remove network + ;; configuration files from etc-service. + (if shared-network? + (modify-services base + (etc-service-type + files =3D> (remove + (match-lambda + ((filename _) + (member filename + (map basename %network-configuration-f= iles)))) + files))) + base))) =20 =2D(define (containerized-operating-system os mappings) +(define* (containerized-operating-system os mappings #:key shared-network?) "Return an operating system based on OS for use in a Linux container environment. MAPPINGS is a list of to realize in the containerized OS." @@ -76,27 +88,53 @@ containerized OS." (define useless-services ;; Services that make no sense in a container. Those that attempt to ;; access /dev/tty[0-9] in particular cannot work in a container. =2D (list console-font-service-type =2D mingetty-service-type =2D agetty-service-type)) + (append (list console-font-service-type + mingetty-service-type + agetty-service-type) + ;; Remove nscd service if network is shared with the host. + (if shared-network? + (list nscd-service-type) + (list)))) + + (define shared-network-file-mappings + ;; Files to map if network is to be shared with the host + (append %network-file-mappings + (let ((nscd-run-directory "/var/run/nscd")) + (if (file-exists? nscd-run-directory) + (list (file-system-mapping + (source nscd-run-directory) + (target nscd-run-directory))) + (list))))) + + ;; (write shared-network-file-mappings) + ;; (newline) =20 (operating-system (inherit os) (swap-devices '()) ; disable swap =2D (essential-services (container-essential-services os)) + (essential-services (container-essential-services + os #:shared-network? shared-network?)) (services (remove (lambda (service) (memq (service-kind service) useless-services)) (operating-system-user-services os))) =2D (file-systems (append (map mapping->fs (cons %store-mapping mappings= )) + (file-systems (append (map mapping->fs + (cons %store-mapping + (append mappings + (if shared-network? + shared-network-file-mappi= ngs + (list))))) %container-file-systems user-file-systems)))) =20 =2D(define* (container-script os #:key (mappings '())) +(define* (container-script os #:key (mappings '()) shared-network?) "Return a derivation of a script that runs OS as a Linux container. MAPPINGS is a list of objects that specify the files/directo= ries that will be shared with the host system." =2D (let* ((os (containerized-operating-system os mappings)) + (let* ((os (containerized-operating-system + os + mappings + #:shared-network? shared-network?)) (file-systems (filter file-system-needed-for-boot? (operating-system-file-systems os))) (specs (map file-system->spec file-systems))) @@ -121,6 +159,9 @@ that will be shared with the host system." ;; users and groups, which is sufficient for most cases. ;; ;; See: http://www.freedesktop.org/software/systemd/man/syst= emd-nspawn.html#--private-users=3D =2D #:host-uids 65536)))) + #:host-uids 65536 + #:namespaces (if #$shared-network? + (delq 'net %namespaces) + %namespaces))))) =20 (gexp->script "run-container" script))) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 3c3d6cbd5f..cf4418f981 100644 =2D-- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -4,6 +4,7 @@ ;;; Copyright =C2=A9 2016, 2017, 2018 Chris Marusich ;;; Copyright =C2=A9 2017 Mathieu Othacehe ;;; Copyright =C2=A9 2018 Ricardo Wurmus +;;; Copyright =C2=A9 2019 Christopher Baines ;;; ;;; This file is part of GNU Guix. ;;; @@ -756,13 +757,17 @@ checking this by themselves in their 'check' procedur= e." =20 (define* (system-derivation-for-action os action #:key image-size file-system-type =2D full-boot? mappings) + full-boot? container-shared-network? + mappings) "Return as a monadic value the derivation for OS according to ACTION." (case action ((build init reconfigure) (operating-system-derivation os)) ((container) =2D (container-script os #:mappings mappings)) + (container-script + os + #:mappings mappings + #:shared-network? container-shared-network?)) ((vm-image) (system-qemu-image os #:disk-image-size image-size)) ((vm) @@ -826,6 +831,7 @@ and TARGET arguments." dry-run? derivations-only? use-substitutes? bootloader-target target image-size file-system-type full-boot? + container-shared-network? (mappings '()) (gc-root #f)) "Perform ACTION for OS. INSTALL-BOOTLOADER? specifies whether to install @@ -834,6 +840,8 @@ target root directory; IMAGE-SIZE is the size of the im= age to be built, for the 'vm-image' and 'disk-image' actions. The root file system is created = as a FILE-SYSTEM-TYPE file system. FULL-BOOT? is used for the 'vm' action; it determines whether to boot directly to the kernel or to the bootloader. +CONTAINER-SHARED-NETWORK? determines if the container will use a separate +network namespace. =20 When DERIVATIONS-ONLY? is true, print the derivation file name(s) without building anything. @@ -883,6 +891,7 @@ static checks." #:file-system-type file-sy= stem-type #:image-size image-size #:full-boot? full-boot? + #:container-shared-network= ? container-shared-network? #:mappings mappings)) =20 ;; For 'init' and 'reconfigure', always build BOOTCFG, even if @@ -1020,6 +1029,8 @@ Some ACTIONS support additional ARGS.\n")) (display (G_ " --share=3DSPEC for 'vm', share host file system according to S= PEC")) (display (G_ " + -N, --network for 'container', allow containers to access the n= etwork")) + (display (G_ " -r, --root=3DFILE for 'vm', 'vm-image', 'disk-image', 'container', and 'build', make FILE a symlink to the result, a= nd register it as a garbage collector root")) @@ -1066,6 +1077,9 @@ Some ACTIONS support additional ARGS.\n")) (lambda (opt name arg result) (alist-cons 'image-size (size->number arg) result))) + (option '(#\N "network") #f #f + (lambda (opt name arg result) + (alist-cons 'container-shared-network? #t result))) (option '("no-bootloader" "no-grub") #f #f (lambda (opt name arg result) (alist-cons 'install-bootloader? #f result))) @@ -1182,6 +1196,8 @@ resulting from command-line parsing." #:file-system-type (assoc-ref opts 'file-syst= em-type) #:image-size (assoc-ref opts 'image-size) #:full-boot? (assoc-ref opts 'full-boot?) + #:container-shared-network? + (assoc-ref opts 'container-shared-network?) #:mappings (filter-map (match-lambda (('file-system-mappi= ng . m) m) =2D-=20 2.21.0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEf3MDQ/Lwnzx3v3nTLiXui2GAK7MFAlzVdHYACgkQLiXui2GA K7OgZwf+KLPiZ4ZXoc247rfoGLYqfQESFJBTAV05xN15tu5ahkk3RLPMRZ1dNSez AXmMij7b7AHprDxBntQHbif0HkXxqQCpusxtYZY2wmOwmUn61o2BkvtbEb3bjz2a li4213nFNvPXbl4anGrHrcLKWr1GhOLjAL47rtV7ivmwyF2QTCBccbONeLMWchrQ EJMOSN3Nz6idcu9q7Vvs0nLkrtwJR0IEJbhsdj6lh8dxUmgY1TYWdoaRmiepcDqp MEOR8RQDgCoTdHMixeIUtxXu1m+R62ESarMTLPsd6ikj8cxpb9pyCsvQYqSin3za /oT2+dwIjq+XfNBZXoKDQLtE18kISQ== =oPQf -----END PGP SIGNATURE----- --==-=-=--