linecook-gem 0.6.9 → 0.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7548b07e15bc2a9a01fa16dbf1d9ad6929293602
-  data.tar.gz: ff6d6af3f5dee670c3b27dd5eced9b6c48d236e4
+  metadata.gz: ae6258ac3d3dbf0e03203631737b4c98b8889cf7
+  data.tar.gz: 9b0e1c1571e3e0ac148503e91df156e4517a0ebc
 SHA512:
-  metadata.gz: 4eceda73724113932ba5fbc76922324760cc64fbd19ebb512ef96269e87a061cb3d8bf11ba8a7fda5cada581d268a9aa04ebc33ed7a49c48f3408f5ae8a3c3b7
-  data.tar.gz: 575d0682c6e9e1c7b3a42aa18b3ca541c71d342dd37a002f4815a1eed39051f2d8f86e4f20d792b1bb681cad6fddb6bc0ddac7ec1e0ffcae817c93536f2a2dc2
+  metadata.gz: c89fd5065cd7fa3e11fc2815dadef2d22f6637ad3264d66f3a588e8ee5a16cbc210b995edde1cf63f2a252ed3e44d35ed8274f789a4116a63cace1ff4d11f152
+  data.tar.gz: 5e90c5ee82015828728efeb7184cdfb58477a762d93230f5998e7cb6bf5863f3b8f5e429e7dbb2cc96de70d4a9d964baa03af1eeb3d14745fbdd9286c051e4e3

data/lib/linecook-gem/builder/lxc.rb

@@ -20,8 +20,10 @@ module Linecook
         @root = File.join(@home, @name, 'rootfs')
         @tmp = tmp
         @tmpmount = "linecook_#{name}"
-        config = { utsname: name, rootfs: @root,  }
-        config.merge!(mount: {entry: "#{capture("mktemp -d --tmpdir=/#{@tmp} #{@tmpmount}XXXXXXX").strip} #{@tmp} none bind,create=dir 0 0"}) if @tmp
+        config = { utsname: name, rootfs: @root, mount: {} }
+        config[:mount][:entry] ||= []
+        config[:mount][:entry] << '/sys/fs/cgroup sys/fs/cgroup none bind 0 0'
+        config[:mount][:entry] << "#{capture("mktemp -d --tmpdir=/#{@tmp} #{@tmpmount}XXXXXXX").strip} #{@tmp} none bind,create=dir 0 0" if @tmp
 
         @config = Linecook::Lxc::Config.generate(config) # FIXME read link from config
         @source_image = image || :base_image
@@ -232,7 +234,7 @@ eos
       extend self
       DEFAULT_LXC_CONFIG = {
         include: '/usr/share/lxc/config/ubuntu.common.conf',
-        aa_profile: 'lxc-container-default-with-nesting',
+        aa_profile: 'unconfined', #'lxc-container-default-with-nesting',
         arch: 'x86.64',
         utsname: 'linecook',
         rootfs: '/u/lxc/linecook/rootfs',
@@ -242,21 +244,21 @@ eos
           link: 'lxcbr0'
         },
         mount: {
-          auto: 'cgroup',
+          auto: ['cgroup', 'proc:rw', 'sys:rw']
+        },
+        cap: {
+          drop: ''
         },
         cgroup: {
           devices: {
-            allow: [
-              'b 7:* rwm',
-              'c 10:237 rwm'
-            ]
+            allow: 'a'
           }
         }
       }.freeze
 
       def generate(**kwargs)
         cfg = []
-        flatten(DEFAULT_LXC_CONFIG.merge(kwargs || {})).each do |k, v|
+        flatten(DEFAULT_LXC_CONFIG.deep_merge(kwargs || {})).each do |k, v|
           [v].flatten.each do |val|
             cfg << "lxc.#{k}=#{val}"
           end

data/lib/linecook-gem/version.rb

@@ -1,3 +1,3 @@
 module Linecook
-  VERSION = '0.6.9'
+  VERSION = '0.6.10'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linecook-gem
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.6.10
 platform: ruby
 authors:
 - Dale Hamel