haconiwa 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 789ac623034f84c580c9a3c0d86d736b10da1582
-  data.tar.gz: e3c63d4dfc082b8edb33d34e96863d952360c80f
+  metadata.gz: 767036a1ab66ab117bcfd75c18b56a3636fa7358
+  data.tar.gz: 1d3cee5db594eb27e3f91eb28bedbf67ef94e146
 SHA512:
-  metadata.gz: 570fa08764eeccba256b7c559bda8b31dff0e9039a6679ff2a66477cab0cc808e6eaaa1dfab5bbd5584e3405c4aa054f1e9cb44847ecc992d62b833eec1c7e17
-  data.tar.gz: 47d510dd9d9485798918214231fba654b2ec5c3cd436e4339bacc9a3469d41a3ac50d01edf70f97c5f75e81f046476aa54e751d961a7a3e759ea58935cd33a5a
+  metadata.gz: 41d15e175b6f1b2fd6475ac558a138770167e1ed9e2d075fe48ec91f0493ceab08e53c619d6fee79e60d1972373041453117b70c41d40afe5bbb22292066599a
+  data.tar.gz: ad935bf20472c72d34066afc60bcacd682e13d4e489bdc606d4aa6eced14f8e4fff9d07ba24275dbc3b46ea0c86617e696ac347a452fedcc88d5b190b6d9405b

data/examples/chroot.haco

@@ -0,0 +1,19 @@
+# -*- mode: ruby -*-
+Haconiwa.define do |config|
+  config.name = "chroot001" # to be hostname
+  config.init_command = "/bin/sh" # to be first process
+
+  root = Pathname.new("/var/haconiwa/root")
+  config.add_mount_point "/var/haconiwa/rootfs", to: root, readonly: true
+  config.add_mount_point "/lib64", to: root.join("lib64"), readonly: true
+  config.add_mount_point "/usr/bin", to: root.join("usr/bin"), readonly: true
+  config.add_mount_point "tmpfs", to: root.join("tmp"), fs: "tmpfs"
+  config.add_mount_point "/var/haconiwa/user_homes/hakoniwa-test001/home/hakoniwa", to: root.join("home/hakoniwa")
+  config.mount_independent_procfs
+  config.chroot_to root
+
+  config.namespace.unshare "mount"
+  config.namespace.unshare "ipc"
+  config.namespace.unshare "uts"
+  config.namespace.unshare "pid"
+end

data/exe/haconiwa

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+require 'haconiwa'
+require 'haconiwa/cli'
+
+subcommand = ARGV[0]
+case subcommand
+when "version"
+  puts Haconiwa::VERSION
+when "run"
+  Haconiwa::Cli.run(ARGV[1..-1])
+end

data/lib/haconiwa/base.rb

@@ -8,6 +8,7 @@ require "haconiwa/runners"
 module Haconiwa
   class Base
     attr_accessor :name,
+                  :init_command,
                   :filesystem,
                   :cgroup,
                   :namespace,
@@ -40,12 +41,16 @@ module Haconiwa
       self.filesystem.mount_independent_procfs = true
     end
 
-    def start(init_command='/sbin/init')
+    def start(*init_command)
       Runners::Linux.run(self, init_command)
     end
     alias run start
   end
 
+  def self.define(&b)
+    Base.define(&b)
+  end
+
   module Utils
     # $ ausyscall --dump | grep hostname
     # 170     sethostname

data/lib/haconiwa/cli.rb

@@ -0,0 +1,15 @@
+module Haconiwa
+  module Cli
+    def self.run(args)
+      require 'pathname'
+      script = File.read(args[0])
+      init   = args[1..-1]
+      if init.first == "--"
+        init.shift
+      end
+
+      container = eval(script)
+      container.run(*init)
+    end
+  end
+end

data/lib/haconiwa/runners/linux.rb

@@ -6,8 +6,12 @@ module Haconiwa::Runners
   # see http://d.hatena.ne.jp/hiboma/20120518/1337337393
 
   class Linux
-    def self.run(base, init_command)
+    def self.run(base, init_command=[])
       container = fork {
+        if init_command.empty?
+          init_command = Array(base.init_command)
+        end
+
         base.namespace.apply!
         base.cgroup.register_all!(to: base.name)
 
@@ -19,12 +23,12 @@ module Haconiwa::Runners
         wrapper = Tempfile.open("haconiwa-wrapper-#{$$}-#{Time.now.to_i}.sh")
 
         wrapper.puts "#!/bin/bash"
-        wrapper.puts "/bin/bash -c \""
+        wrapper.puts "/bin/bash -c '"
         if base.filesystem.mount_independent_procfs
           wrapper.puts "mount -t proc proc /proc;"
         end
-        wrapper.puts "exec $1;"
-        wrapper.puts "\""
+        wrapper.puts "exec $@;"
+        wrapper.puts "' -- \"$@\""
         wrapper.close
         FileUtils.chmod 0700, wrapper.path
 
@@ -34,18 +38,22 @@ module Haconiwa::Runners
 
         if base.namespace.use_pid_ns
           Bundler.with_clean_env {
-            exec "unshare", "--pid", "--", wrapper.path, init_command
+            exec "unshare", "--pid", "--", wrapper.path, *init_command
           }
         else
-          Bundler.with_clean_env { exec wrapper.path, init_command }
+          Bundler.with_clean_env { exec wrapper.path, *init_command }
         end
       }
 
       Haconiwa::SmallCgroup.register_at_exit(pid: container, name: base.name, dirs: base.cgroup.to_dirs)
       puts "New container: PID = #{container}"
 
-      Process.waitpid container
-      puts "Successfully exit container."
+      res = Process.waitpid2 container
+      if res[1].success?
+        puts "Successfully exit container."
+      else
+        puts "Container exited with status code <#{res[1].to_i}>."
+      end
     end
   end
 end

data/lib/haconiwa/version.rb

@@ -1,3 +1,3 @@
 module Haconiwa
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haconiwa
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Uchio KONDO
@@ -111,7 +111,8 @@ dependencies:
 description: Ruby on Container / helper tools with DSL for your handmade linux containers.
 email:
 - udzura@udzura.jp
-executables: []
+executables:
+- haconiwa
 extensions: []
 extra_rdoc_files: []
 files:
@@ -126,14 +127,17 @@ files:
 - Vagrantfile
 - bin/console
 - bin/setup
+- examples/chroot.haco
 - examples/chroot.rb
 - examples/cpu.rb
 - examples/drop_cap_sys_time.rb
+- exe/haconiwa
 - haconiwa.gemspec
 - lib/haconiwa.rb
 - lib/haconiwa/base.rb
 - lib/haconiwa/capabilities.rb
 - lib/haconiwa/cgroup.rb
+- lib/haconiwa/cli.rb
 - lib/haconiwa/filesystem.rb
 - lib/haconiwa/mount_point.rb
 - lib/haconiwa/namespace.rb