guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

15/15: scripts: Add 'container' subcommand.


From: David Thompson
Subject: 15/15: scripts: Add 'container' subcommand.
Date: Thu, 02 Jul 2015 00:59:02 +0000

davexunit pushed a commit to branch wip-container
in repository guix.

commit a3cbf1171cd53e6b560fe700b7b7ff5be89ebd19
Author: David Thompson <address@hidden>
Date:   Wed Jul 1 20:32:07 2015 -0400

    scripts: Add 'container' subcommand.
    
    * guix/scripts/container.scm: New file.
    * guix/scripts/container/exec.scm: New file.
    * Makefile.am (MODULES): Add them.
---
 Makefile.am                     |    2 +
 guix/scripts/container.scm      |   64 +++++++++++++++++++++++++++++++
 guix/scripts/container/exec.scm |   80 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 146 insertions(+), 0 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index cc0b135..7325185 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -116,6 +116,8 @@ MODULES =                                   \
   guix/scripts/publish.scm                     \
   guix/scripts/edit.scm                                \
   guix/scripts/size.scm                                \
+  guix/scripts/container.scm                   \
+  guix/scripts/container/exec.scm              \
   guix.scm                                     \
   $(GNU_SYSTEM_MODULES)
 
diff --git a/guix/scripts/container.scm b/guix/scripts/container.scm
new file mode 100644
index 0000000..8c20982
--- /dev/null
+++ b/guix/scripts/container.scm
@@ -0,0 +1,64 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2015 David Thompson <address@hidden>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (guix scripts container)
+  #:use-module (ice-9 match)
+  #:use-module (guix ui)
+  #:export (guix-container))
+
+(define (show-help)
+  (display (_ "Usage: guix container ACTION ARGS...
+Build and manipulate Linux containers.\n"))
+  (newline)
+  (display (_ "The valid values for ACTION are:\n"))
+  (newline)
+  (display (_ "\
+   eval            Evaluate an expression inside a container\n"))
+  (display (_ "\
+   exec            Execute a command inside of an existing container\n"))
+  (newline)
+  (display (_ "
+  -h, --help             display this help and exit"))
+  (display (_ "
+  -V, --version          display version information and exit"))
+  (newline)
+  (show-bug-report-information))
+
+(define actions '("eval" "exec"))
+
+(define (resolve-action name)
+  (let ((module (resolve-interface
+                 `(guix scripts container ,(string->symbol name))))
+        (proc (string->symbol (string-append "guix-container-" name))))
+    (module-ref module proc)))
+
+(define (guix-container . args)
+  (match args
+    (()
+     (format (current-error-port)
+             (_ "guix container: missing action~%")))
+    ((or ("-h") ("--help"))
+     (show-help)
+     (exit 0))
+    (("--version")
+     (show-version-and-exit "guix container"))
+    ((action args ...)
+     (if (member action actions)
+         (apply (resolve-action action) args)
+         (format (current-error-port)
+                 (_ "guix container: invalid action~%"))))))
diff --git a/guix/scripts/container/exec.scm b/guix/scripts/container/exec.scm
new file mode 100644
index 0000000..858f9cb
--- /dev/null
+++ b/guix/scripts/container/exec.scm
@@ -0,0 +1,80 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2015 David Thompson <address@hidden>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (guix scripts container exec)
+  #:use-module (ice-9 match)
+  #:use-module (srfi srfi-1)
+  #:use-module (srfi srfi-11)
+  #:use-module (srfi srfi-37)
+  #:use-module (guix ui)
+  #:use-module (guix utils)
+  #:use-module (gnu build linux-container)
+  #:export (guix-container-exec))
+
+(define %options
+  (list (option '(#\h "help") #f #f
+                (lambda args
+                  (show-help)
+                  (exit 0)))
+        (option '(#\V "version") #f #f
+                (lambda args
+                  (show-version-and-exit "guix container exec")))))
+
+(define (show-help)
+  (display (_ "Usage: guix container exec PID COMMAND [ARGS...]
+Execute COMMMAND within the container process PID.\n"))
+  (newline)
+  (display (_ "
+  -h, --help             display this help and exit"))
+  (display (_ "
+  -V, --version          display version information and exit"))
+  (newline)
+  (show-bug-report-information))
+
+(define (partition-args args)
+  "Split ARGS into two lists; one containing the arguments for this program,
+and the other containing arguments for the command to be executed."
+  (partition (lambda (arg)
+               ;; Split after the PID argument.
+               (number? (false-if-exception
+                         (string->number arg))))
+             args))
+
+(define (guix-container-exec . args)
+  (define (handle-argument arg result)
+    (if (assoc-ref result 'pid)
+        (leave (_ "~a: extraneous argument~%") arg)
+        (alist-cons 'pid (string->number* arg) result)))
+
+  (let-values (((args command) (partition-args args)))
+    (let* ((opts (parse-command-line args %options '(())
+                                        #:argument-handler
+                                        handle-argument))
+           (pid  (assoc-ref opts 'pid)))
+
+      (unless pid
+        (leave (_ "no pid specified~%")))
+
+      (when (null? command)
+        (leave (_ "no command specified~%")))
+
+      (container-excursion pid
+        (lambda ()
+          (match command
+            ((program . program-args)
+             (apply execlp program program program-args))))))))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]