From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58585) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eqLgA-0008A1-OP for guix-patches@gnu.org; Mon, 26 Feb 2018 11:31:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eqLg6-0000vx-MK for guix-patches@gnu.org; Mon, 26 Feb 2018 11:31:06 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:54047) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eqLg6-0000vS-CM for guix-patches@gnu.org; Mon, 26 Feb 2018 11:31:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eqLg6-0004tu-0s for guix-patches@gnu.org; Mon, 26 Feb 2018 11:31:02 -0500 Subject: [bug#30572] [PATCH 6/7] system: Add "guix system docker-image" command. Resent-Message-ID: From: Chris Marusich References: <20180222103528.5108-1-cmmarusich@gmail.com> <20180222103528.5108-6-cmmarusich@gmail.com> Date: Mon, 26 Feb 2018 17:30:46 +0100 In-Reply-To: <20180222103528.5108-6-cmmarusich@gmail.com> (Chris Marusich's message of "Thu, 22 Feb 2018 11:35:27 +0100") Message-ID: <87k1uzr9vt.fsf@garuda.local.i-did-not-set--mail-host-address--so-tickle-me> 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: Chris Marusich Cc: 30572@debbugs.gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Chris Marusich writes: > + (let ((tmpdir "/xchg/tmp")) > + (mkdir tmpdir) > + (build-docker-image > + (string-append "/xchg/" #$name) ;; The output file. > + #$os-drv > + #:closure (string-append "/xchg/" #$system-graph-name) > + #:compressor '(#+(file-append gzip "/bin/gzip") "-9n") > + #:creation-time (make-time time-utc 0 1) > + #:tmpdir tmpdir > + #:extra-items-dir root) > + (delete-file-recursively tmpdir)))))) I've adjusted this section to take into account the changes I made to patches earlier in the series. Please find attached a new Patch 6/7, which incorporates these minor adjustments. =2D-=20 Chris --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0006-system-Add-guix-system-docker-image-command.patch Content-Transfer-Encoding: quoted-printable From=201b325723f87ac09d4ac0b860f76982a07e14a985 Mon Sep 17 00:00:00 2001 From: Chris Marusich Date: Tue, 20 Feb 2018 09:12:48 +0100 Subject: [PATCH 6/8] system: Add "guix system docker-image" command. * gnu/system/vm.scm (system-docker-image): New procedure. * guix/scripts/system.scm (system-derivation-for-action): Add a case for docker-image, and in that case, call system-docker-image. (show-help): Document docker-image. (guix-system): Parse arguments for docker-image. * doc/guix.texi (Invoking guix system): Document "guix system docker-image". * gnu/system/examples/docker-image.tmpl: New file. =2D-- doc/guix.texi | 34 ++++++++-- gnu/system/examples/docker-image.tmpl | 47 ++++++++++++++ gnu/system/vm.scm | 114 ++++++++++++++++++++++++++++++= ++++ guix/scripts/system.scm | 10 ++- 4 files changed, 198 insertions(+), 7 deletions(-) create mode 100644 gnu/system/examples/docker-image.tmpl diff --git a/doc/guix.texi b/doc/guix.texi index 32e132d87..3a1708e54 100644 =2D-- a/doc/guix.texi +++ b/doc/guix.texi @@ -19294,10 +19294,14 @@ size of the image. =20 @item vm-image @itemx disk-image =2DReturn a virtual machine or disk image of the operating system declared =2Din @var{file} that stands alone. By default, @command{guix system} =2Destimates the size of the image needed to store the system, but you can =2Duse the @option{--image-size} option to specify a value. +@itemx docker-image +Return a virtual machine, disk image, or Docker image of the operating +system declared in @var{file} that stands alone. By default, +@command{guix system} estimates the size of the image needed to store +the system, but you can use the @option{--image-size} option to specify +a value. Docker images are built to contain exactly what they need, so +the @option{--image-size} option is ignored in the case of +@code{docker-image}. =20 You can specify the root file system type by using the @option{--file-system-type} option. It defaults to @code{ext4}. @@ -19315,6 +19319,28 @@ using the following command: # dd if=3D$(guix system disk-image my-os.scm) of=3D/dev/sdc @end example =20 +When using @code{docker-image}, a Docker image is produced. Guix builds +the image from scratch, not from a pre-existing Docker base image. As a +result, it contains @emph{exactly} what you define in the operating +system configuration file. You can then load the image and launch a +Docker container using commands like the following: + +@example +image_id=3D"$(docker load < guixsd-docker-image.tar.gz)" +docker run -e GUIX_NEW_SYSTEM=3D/var/guix/profiles/system \\ + --entrypoint /var/guix/profiles/system/profile/bin/guile \\ + $image_id /var/guix/profiles/system/boot +@end example + +This command starts a new Docker container from the specified image. It +will boot the GuixSD system in the usual manner, which means it will +start any services you have defined in the operating system +configuration. Depending on what you run in the Docker container, it +may be necessary to give the container additional permissions. For +example, if you intend to build software using Guix inside of the Docker +container, you may need to pass the @option{--privileged} option to +@code{docker-run}. + @item container Return a script to run the operating system declared in @var{file} within a container. Containers are a set of lightweight isolation diff --git a/gnu/system/examples/docker-image.tmpl b/gnu/system/examples/do= cker-image.tmpl new file mode 100644 index 000000000..d73187398 =2D-- /dev/null +++ b/gnu/system/examples/docker-image.tmpl @@ -0,0 +1,47 @@ +;; This is an operating system configuration template for a "Docker image" +;; setup, so it has barely any services at all. + +(use-modules (gnu)) + +(operating-system + (host-name "komputilo") + (timezone "Europe/Berlin") + (locale "en_US.utf8") + + ;; This is where user accounts are specified. The "root" account is + ;; implicit, and is initially created with the empty password. + (users (cons (user-account + (name "alice") + (comment "Bob's sister") + (group "users") + (supplementary-groups '("wheel" + "audio" "video")) + (home-directory "/home/alice")) + %base-user-accounts)) + + ;; Globally-installed packages. + (packages %base-packages) + + ;; Because the system will run in a Docker container, we may omit many + ;; things that would normally be required in an operating system + ;; configuration file. These things include: + ;; + ;; * bootloader + ;; * file-systems + ;; * services such as mingetty, udevd, slim, networking, dhcp + ;; + ;; Either these things are simply not required, or Docker provides + ;; similar services for us. + + ;; This will be ignored. + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "does-not-matter"))) + ;; This will be ignored, too. + (file-systems (list (file-system + (device "does-not-matter") + (mount-point "/") + (type "does-not-matter")))) + + ;; Guix is all you need! + (services (list (guix-service)))) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 345cecedd..e9a94019d 100644 =2D-- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -22,6 +22,7 @@ =20 (define-module (gnu system vm) #:use-module (guix config) + #:use-module (guix docker) #:use-module (guix store) #:use-module (guix gexp) #:use-module (guix derivations) @@ -29,14 +30,18 @@ #:use-module (guix monads) #:use-module (guix records) #:use-module (guix modules) + #:use-module (guix scripts pack) #:use-module (guix utils) =20 #:use-module ((gnu build vm) #:select (qemu-command)) #:use-module (gnu packages base) + #:use-module (gnu packages bootloaders) #:use-module (gnu packages cdrom) + #:use-module (gnu packages compression) #:use-module (gnu packages guile) + #:autoload (gnu packages gnupg) (libgcrypt) #:use-module (gnu packages gawk) #:use-module (gnu packages bash) #:use-module (gnu packages less) @@ -73,6 +78,7 @@ system-qemu-image/shared-store system-qemu-image/shared-store-script system-disk-image + system-docker-image =20 virtual-machine virtual-machine?)) @@ -366,6 +372,114 @@ the image." #:disk-image-format disk-image-format #:references-graphs inputs)) =20 +(define* (system-docker-image os + #:key + (name "guixsd-docker-image") + register-closures?) + "Build a docker image. OS is the desired . NAME is t= he +base name to use for the output file. When REGISTER-CLOSURES? is not #f, +register the closure of OS with Guix in the resulting Docker image. This = only +makes sense when you want to build a GuixSD Docker image that has Guix +installed inside of it. If you don't need Guix (e.g., your GuixSD Docker +image just contains a web server that is started by Shepherd), then you sh= ould +set REGISTER-CLOSURES? to #f." + (define not-config? + (match-lambda + (('guix 'config) #f) + (('guix rest ...) #t) + (('gnu rest ...) #t) + (rest #f))) + + (define config + ;; (guix config) module for consumption by (guix gcrypt). + (scheme-file "gcrypt-config.scm" + #~(begin + (define-module (guix config) + #:export (%libgcrypt)) + + ;; XXX: Work around . + (eval-when (expand load eval) + (define %libgcrypt + #+(file-append libgcrypt "/lib/libgcrypt")))))) + + (define json + ;; Pick the guile-json package that corresponds to the Guile used to b= uild + ;; derivations. + (if (string-prefix? "2.0" (package-version (default-guile))) + guile2.0-json + guile-json)) + + (mlet %store-monad ((os-drv (operating-system-derivation os #:container?= #t)) + (name -> (string-append name ".tar.gz")) + (system-graph-name -> "system") + ;; Use a Guile that supports dlopen because it needs= to + ;; dlopen libgcrypt in the initrd. See: + ;; https://lists.gnu.org/archive/html/guix-devel/201= 7-10/msg00233.html + (initrd (base-initrd %linux-vm-file-systems + #:virtio? #t + #:guile guile-2.2))) + (define build + (with-imported-modules `(,@(source-module-closure '((guix docker) + (gnu build vm) + (guix build util= s) + (guix build sysc= alls)) + #:select? not-conf= ig?) + ((guix config) =3D> ,config)) + #~(begin + ;; Guile-JSON is required by (guix docker). + (add-to-load-path + (string-append #+json "/share/guile/site/" + (effective-version))) + (use-modules (gnu build vm) + (guix build utils) + (guix build syscalls) + (srfi srfi-26) + (ice-9 match) + (guix docker) + (srfi srfi-19)) + + (let* ((inputs + '#$(append (list tree parted e2fsprogs dosfstools tar) + (map canonical-package + (list sed grep coreutils findutils gaw= k)) + (if register-closures? (list guix) '()))) + + ;; This variable is unused but allows us to add INPUTS-= TO-COPY + ;; as inputs. + (to-register '#$os-drv) + (initialize (root-partition-initializer + #:closures '(#$system-graph-name) + #:register-closures? #$register-closures? + #:system-directory #$os-drv + ;; De-duplication would fail due to + ;; cross-device link errors, so don't do i= t. + #:deduplicate? #f)) + (root "/tmp/root")) + + (set-path-environment-variable "PATH" '("bin" "sbin") inputs) + (mkdir-p root) + (initialize root) + ;; Use a temporary directory inside xchg to avoid hitting sp= ace + ;; limitations in the initrd's root file system. + (let ((tmpdir "/xchg/tmp/docker-image")) + (build-docker-image + (string-append "/xchg/" #$name) ;; The output file. + #$os-drv + #:closure (string-append "/xchg/" #$system-graph-name) + #:compressor '(#+(file-append gzip "/bin/gzip") "-9n") + #:creation-time (make-time time-utc 0 1) + #:tmpdir tmpdir + #:extra-items-dir root)))))) + (expression->derivation-in-linux-vm + name + build + #:initrd initrd + #:make-disk-image? #f + #:single-file-output? #t + #:references-graphs `((,system-graph-name ,os-drv)) + ;; Our larger initrd requires more memory. + #:memory-size 512))) + ;;; ;;; VM and disk images. diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 999ffb010..20919d1b1 100644 =2D-- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -670,7 +670,9 @@ procedure of its type." ("iso9660" "image.iso") (_ "disk-image")) #:disk-image-size image-size =2D #:file-system-type file-system-type)))) + #:file-system-type file-system-type)) + ((docker-image) + (system-docker-image os #:register-closures? #t)))) =20 (define (maybe-suggest-running-guix-pull) "Suggest running 'guix pull' if this has never been done before." @@ -867,6 +869,8 @@ Some ACTIONS support additional ARGS.\n")) vm-image build a freestanding virtual machine image\n")) (display (G_ "\ disk-image build a disk image, suitable for a USB stick\n")) + (display (G_ "\ + docker-image build a Docker image\n")) (display (G_ "\ init initialize a root file system to run GNU\n")) (display (G_ "\ @@ -1098,7 +1102,7 @@ argument list and OPTS is the option alist." (case action ((build container vm vm-image disk-image reconfigure init extension-graph shepherd-graph list-generations roll-back =2D switch-generation search) + switch-generation search docker-image) (alist-cons 'action action result)) (else (leave (G_ "~a: unknown action~%") action)))))) =20 @@ -1127,7 +1131,7 @@ argument list and OPTS is the option alist." (exit 1)) =20 (case action =2D ((build container vm vm-image disk-image reconfigure) + ((build container vm vm-image disk-image docker-image reconfigure) (unless (or (=3D count 1) (and expr (=3D count 0))) (fail))) =2D-=20 2.15.1 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEy/WXVcvn5+/vGD+x3UCaFdgiRp0FAlqUNjYACgkQ3UCaFdgi Rp0yXw/8CfPVp+h90rWXeAcEZ0MQYEHRFYSlsM630AjQUe/boN/1cEbeOYQPKu82 UFFRIJAg6dqszVo4p76wxoza3JXrDJ47RNz3lnsGe2uuyGKb4teG/sk3Y+XYG0qb 8lzspU4QVa9eBl4QANce1Cy/wBUpB/VA66pMm3Hfsj9Ut0+7JXP4dQgu5SHsk28q g8NwgL9XibKcC+lFPUl8fObwPeRmTF5eAPVRBLKoquNSqfQkyhZuQcVc0Im1Fp2F p+ka2X6XO12xSN6dSBGCfUVoZdsnMopKvwT95yEjGq3C4IXo3yG//zUDI03i5Ayb DSqPSYa32iI7+cL5jeeTF1ZgfR4DiJ00xYzQYCmoLI8t2kXtTtNlkuvKp0i+GK4M In+74zjV2YoDvRYpP90yw1sqqOb7YindgNeLnxgE6W9dSMedg4z98yhd4QaFluNT bCtF33RyM4aq1uQ2/u0y4gOdXCmQThPc8X6q5RfGFIODpX9dmv1ciTbZGaYGjwhs 332LEExAl1DhIuhMoZd+nBaRAPC8HxgmB7wVsjUL+HNZfvcHJl28l67HG+I+1o89 nw2tplwBZP299GdM+tP238V2pxgIKbvl8ouu2FT3ByDSDWnl7M/hZTDRzG796dr1 71iF0ZMeWTy1Fbrdjkz9NwavCBfxsE2KctS4lhEpY7PiFZ4qMJQ= =rM0N -----END PGP SIGNATURE----- --==-=-=--