docker-builder 0.1.31 → 0.1.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31f8f20a4c06dcd857f30ecd4c51150aa00696e1
-  data.tar.gz: 1e421d96878d8ba19816b26e6244e6453530c3c9
+  metadata.gz: e90a5e99b9a343019561a04e30ece9dcf3c99d3a
+  data.tar.gz: 117834a1f3e17eb41bf1034b086b05ab12ec74aa
 SHA512:
-  metadata.gz: 1661019db55a933fb618017c8a6ae4c397fdd2e4a70685393a69fe01ad2779ebbbd4dfe32ef2076bb48c9e7924e299f6e13ab27395e75cca968acede7ca2037e
-  data.tar.gz: 29260015299048be1cd780983f4631b5d787c365a0fd7f3b1ff2a73973ba1742819ff0b0131bd9b212169cc0673daf1ef2a7d99edbea0b59681a5504c0900c68
+  metadata.gz: 5b00af59417ad24e1e676bc0e9a4ee093625901c04f833d81c0008da74d6172f30718a7c2e08bcfcb2702bfc269f3cfd209e596e7a09382be8801494967b9dea
+  data.tar.gz: 1e0a25f0ebb8b9ba81b377c5b925deb3de932cd9a84711fa8ef5c3c6937ade06c362ff5163789c492820c0ab1a48ee18bc428cbe721971f04b6fa2c37d22c222

data/install_local.sh

@@ -1,2 +1,2 @@
 gem build docker-builder.gemspec
-gem install ./docker-builder-0.1.31.gem
+gem install ./docker-builder-0.1.32.gem

data/lib/docker_builder/manager.rb

@@ -13,6 +13,19 @@ class Manager
   end
 
 
+  def self.save_config_json(settings)
+    require 'json'
+    filename = settings.filename_config_json
+    FileUtils.mkdir_p(File.dirname(filename))
+    File.open(filename,"w+") do |f|
+      f.write(settings.all_attributes.to_json)
+    end
+
+    #puts "f==#{filename}"
+
+    true
+  end
+
   ###
   def self.build_image(server_name, settings=nil)
     puts "building image for #{server_name}..."
@@ -136,23 +149,36 @@ class Manager
   def self._run_container(settings)
     puts "run container ..."
 
-    bootstrap_type = (settings['install']['bootstrap']['type'] rescue nil)
+    # generate config
+    save_config_json(settings)
 
-    #
+    # create
     create_container(settings)
 
+    setup_network(settings)
+
+
+    ### BEFORE START
+
+    # run setup provision scripts
+    setup_scripts = (settings['provision']['setup'] rescue [])
+    setup_scripts.each do |script|
+      _run_setup_script(settings, script)
+    end
+
+    # ??? TODO: remove it ?
+    # run some provision scripts - for chef
+    bootstrap_type = (settings['install']['bootstrap']['type'] rescue nil)
+
     # before start
     if bootstrap_type && bootstrap_type=='chef'
       _bootstrap_container_prepare(settings)
     end
 
 
-    # start
+    ### START && run provision after start
     start_container(name, settings)
 
-
-
-
     true
   end
 
@@ -162,22 +188,42 @@ class Manager
     # create
     cmd %Q(docker create --name #{settings.container_name} #{settings.docker_ports_string} #{settings.docker_volumes_string} #{settings.docker_volumes_from_string} #{settings.docker_links_string}  #{settings.run_extra_options_string} #{settings.run_env_variables_string} #{settings.image_name} #{settings['docker']['command']} #{settings['docker']['run_options']})
 
+
+  end
+
+
+  def self.setup_network(settings)
+    container_name = settings.container_name
+
     # networks
     networks = settings['docker'].fetch('network', {}).fetch('networks', [])
     if networks
       networks.each do |net|
+        next if net['action']=='remove'
+
         ip = net['ip']
         s_ip = "--ip #{ip}" if ip
         #puts %Q(docker network connect #{s_ip}  #{net['net']} #{settings.container_name})
         cmd %Q(docker network connect #{s_ip}  #{net['net']} #{settings.container_name})
       end
+
+      # remove
+      networks.each do |net|
+        next unless net['action']=='remove'
+        cmd %Q(docker network disconnect #{net['net']} #{settings.container_name})
+      end
     end
   end
 
+
+
   def self.start_container(name, settings)
     # start
     cmd %Q(docker start #{settings.container_name})
 
+    # wait
+    wait_until_running(settings.container_name)
+
     # setup
     setup_container_after_start(settings)
 
@@ -186,10 +232,26 @@ class Manager
   end
 
 
+  def self.wait_until_running(container_name)
+    retries = 20
+    until system("docker exec #{container_name} true") || retries < 0
+      sleep 0.5
+      retries == retries - 1
+    end
+
+    assert_container_running(container_name)
+  end
+
+  def self.assert_container_running(container_name)
+    res = system("docker exec #{container_name} true")
+    assert res, "Container #{container_name} is not running"
+  end
+
   def self.setup_container_after_start(settings)
 
     # default gateway
-    network= settings['docker']['network']
+=begin
+    network = settings['docker']['network']
     if network
       gateway = network['default_gateway']
 
@@ -199,7 +261,7 @@ class Manager
         cmd %Q(docker exec #{settings.container_name} ip route change default via #{gateway})
       end
     end
-
+=end
 
 
     # fix hosts
@@ -245,7 +307,7 @@ class Manager
       #script = settings['install']['bootstrap']['script'] || '/opt/bootstrap/bootstrap.sh'
 
       # bootstsrap with shell script
-      run_bootsrap_shell_script_in_container(settings, install_bootstrap_script)
+      run_bootstrap_shell_script_in_container(settings, install_bootstrap_script)
     end
 
 
@@ -253,7 +315,7 @@ class Manager
   end
 
 
-  def self.run_bootsrap_shell_script_in_container(settings, script_path)
+  def self.run_bootstrap_shell_script_in_container(settings, script_path)
     # exec
     cmd %Q(docker exec #{settings.container_name} #{script_path} )
   end
@@ -285,6 +347,21 @@ class Manager
 
   ### provision
 
+  def self._run_setup_script(settings, script)
+    if script['type']=='shell'
+      return _run_setup_script_shell(settings, script)
+    end
+
+    return nil
+  end
+
+  def self._run_setup_script_shell(settings, script)
+    #
+    cmd %Q(cd #{settings.dir_server_root} && #{script['script']} )
+
+  end
+
+
   def self._bootstrap_container_prepare(settings)
     require_relative '../../lib/docker_builder/provisioner/provisioner_chef'
 
@@ -501,5 +578,14 @@ class Manager
     cmd %Q(cd #{Config.root_path} && rm -f #{settings.filename_chef_node_json} )
     cmd %Q(cd #{Config.root_path} && rm -f #{settings.filename_chef_client_json} )
   end
+
+
+  ### common helpers
+  def self.assert(expression, string = "Assert failed")
+    unless expression
+      throw Exception.new string
+    end
+  end
+
 end
 end

data/lib/docker_builder/version.rb

@@ -1,3 +1,3 @@
 module DockerBuilder
-  VERSION = "0.1.31"
+  VERSION = "0.1.32"
 end

data/readme.md

@@ -697,6 +697,24 @@ RUN chmod +x /opt/bootstrap/bootstrap.sh
 
 
 
+## remove default network
+
+remove default network 'bridge'
+
+```
+'docker'=> {
+..
+'network': {
+   networks: {
+      {net: 'bridge', action: 'remove'}, # remove default docker bridge
+      {net: 'mybridge1', ip: '10.1.0.12'},
+      {net: 'my_overlay1', ip: '51.1.0.15'},
+   }
+}
+
+}
+```
+
 ## multiple networks
 
 ```

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-builder
 version: !ruby/object:Gem::Version
-  version: 0.1.31
+  version: 0.1.32
 platform: ruby
 authors:
 - Max Ivak
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-21 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler