docker-builder 0.1.25 → 0.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 590dc97a71333ef0960838b0f668c7f79bd5f2f9
-  data.tar.gz: 8beb8ea5d8fb422e1c59eb7568aedea7e077a0c9
+  metadata.gz: fb25008d4f2f9e81b4cb3838fa9aaf50836061fe
+  data.tar.gz: 1a41a6e5f930d7b5904ff0104afabf11e546b776
 SHA512:
-  metadata.gz: 286b88c096ae6f4eeea52b906be704b49f82f008fb954497081f813376614ad069684861719781f745c1cba3389148971d5ca7cf9ebfc312861f470719b8de98
-  data.tar.gz: f4c26d92e464377fe7992c5519af87dac68113e40c24365283af0a32692ca09be5fa93f72c087edbebb7d66e4713df06b0252d147362916a16cde7462c9a8e25
+  metadata.gz: af7cf7a928edc1de2fe7ea1c2e871c7b1ec2b1fdfa0f139553e8bc14f5c53e8464bb991a8acc69e8f57c17fa9928a3815926ad4cace66f5495197668a0f28f05
+  data.tar.gz: f0f127dd2eb74cc3dcfd241a45285b1599fd17f4005385bcf17c97201eb89ef6d3a6862712c65304c2f7a73cc4c9cd3c0378c255e4de480aafde073fc711d1f1

data/install_local.sh

@@ -1,2 +1,2 @@
 gem build docker-builder.gemspec
-gem install ./docker-builder-0.1.25.gem
+gem install ./docker-builder-0.1.26.gem

data/lib/docker_builder/cli.rb

@@ -196,8 +196,14 @@ class CLI < Thor
       Config.servers.each do |name, opts|
         server_settings = Settings.load_settings_for_server(name)
 
-        Manager.destroy_container(name, server_settings)
-        Manager.run_container(name, server_settings)
+        if server_settings.is_swarm_mode?
+          ManagerSwarm.destroy_service(name, server_settings)
+          ManagerSwarm.create_service(name, server_settings)
+        else
+          Manager.destroy_container(name, server_settings)
+          Manager.run_container(name, server_settings)
+        end
+
       end
 
     rescue Exception => err
@@ -256,7 +262,12 @@ class CLI < Thor
       Config.servers.each do |name, opts|
         server_settings = Settings.load_settings_for_server(name)
 
-        Manager.destroy_container(name, server_settings)
+        if server_settings.is_swarm_mode?
+          ManagerSwarm.destroy_service(name, server_settings)
+        else
+          Manager.destroy_container(name, server_settings)
+        end
+
       end
 
     rescue Exception => err
@@ -330,116 +341,6 @@ class CLI < Thor
   end
 
 
-  ### swarm mode
-
-  ##
-  # [up_swarm]
-  #
-  #
-  desc 'up_swarm', 'Run Docker container in swarm mode'
-
-  long_desc <<-EOS.gsub(/^ +/, '')
-  Run Docker container in swarm mode.
-  EOS
-
-  method_option :server,
-                :aliases  => ['-s', '--server'],
-                :required => false,
-                :type     => :string,
-                :desc     => "Server name"
-
-  method_option :root_path,
-                :aliases  => '-r',
-                :type     => :string,
-                :default  => '',
-                :desc     => 'Root path to base all relative path on.'
-
-  method_option :config_file,
-                :aliases  => '-c',
-                :type     => :string,
-                :default  => 'config.rb',
-                :desc     => 'Path to your config.rb file.'
-
-  def up_swarm
-    puts "running..."
-
-    warnings = false
-    errors = false
-
-
-    servers = nil
-    begin
-      Config.load(options)
-
-      Config.servers.each do |name, opts|
-        server_settings = Settings.load_settings_for_server(name)
-
-        ManagerSwarm.destroy_service(name, server_settings)
-        ManagerSwarm.create_service(name, server_settings)
-      end
-
-    rescue Exception => err
-      puts "exception: #{err.inspect}"
-      raise err
-      exit(3)
-    end
-
-    exit(errors ? 2 : 1) if errors || warnings
-
-  end
-
-  ##
-  # [destroy_swarm]
-  #
-  #
-  desc 'destroy_swarm', 'Remove service in Docker swarm mode'
-
-  long_desc <<-EOS.gsub(/^ +/, '')
-  Remove service in Docker swarm mode
-  EOS
-
-  method_option :server,
-                :aliases  => ['-s', '--server'],
-                :required => false,
-                :type     => :string,
-                :desc     => "Server name"
-
-  method_option :root_path,
-                :aliases  => '-r',
-                :type     => :string,
-                :default  => '',
-                :desc     => 'Root path to base all relative path on.'
-
-  method_option :config_file,
-                :aliases  => '-c',
-                :type     => :string,
-                :default  => 'config.rb',
-                :desc     => 'Path to your config.rb file.'
-
-  def destroy_swarm
-    puts "destroying..."
-
-    warnings = false
-    errors = false
-
-    servers = nil
-    begin
-      Config.load(options)
-
-      Config.servers.each do |name, opts|
-        server_settings = Settings.load_settings_for_server(name)
-        ManagerSwarm.destroy_service(name, server_settings)
-      end
-
-    rescue Exception => err
-      puts "exception: #{err.inspect}"
-      raise err
-      exit(3)
-    end
-
-    exit(errors ? 2 : 1) if errors || warnings
-
-  end
 
 
 

data/lib/docker_builder/manager.rb

@@ -149,7 +149,7 @@ class Manager
       #_provision_container_chef_recipe(settings)
     elsif script_type && script_type=='shell'
       # docker run
-      cmd %Q(docker run -d --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']})
+      create_and_run_container(settings)
 
       # provision with shell script
       run_shell_script_in_container(settings, "install.sh")
@@ -159,22 +159,49 @@ class Manager
       #_run_container_docker(settings)
 
       # docker run
-      cmd %Q(docker run -d --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']})
+      create_and_run_container(settings)
 
     end
 
+    true
+  end
 
-    # fix hosts
-    #puts "adding hosts..."
-    #puts "a= #{settings.attributes}"
+  def self.create_and_run_container(settings)
+    #cmd %Q(docker run -d --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']})
 
-    container_hosts = settings.node['hosts'] || []
-    container_hosts.each do |r|
-      cmd %Q(docker exec #{settings.container_name} bash -c 'echo "#{r[0]} #{r[1]}" >>  /etc/hosts')
+    # 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']})
+
+    # second network
+    network2 = settings['docker']['network_secondary']
+    if network2
+      ip = network2['ip']
+      s_ip = "--ip #{ip}" if ip
+      cmd %Q(docker network connect #{s_ip}  #{network2['net']} #{settings.container_name})
     end
 
+    # start
+    cmd %Q(docker start #{settings.container_name})
 
-    true
+    # fixes
+    if network2
+      gateway = network2['gateway']
+
+      if gateway
+        # fix default gateway
+        cmd %Q(docker exec #{settings.container_name} ip route change default via #{gateway} dev eth1)
+      end
+
+    end
+
+    # fix hosts
+    puts "fix hosts"
+    container_hosts = settings['docker']['hosts'] || []
+    container_hosts.each do |r|
+      puts "fix host #{r[0]} #{r[1]}"
+      #cmd %Q(docker exec #{settings.container_name} bash -c 'echo "#{r[0]} #{r[1]}" >>  /etc/hosts')
+      cmd %Q(docker exec #{settings.container_name} sh -c 'echo "#{r[0]} #{r[1]}" >>  /etc/hosts')
+    end
   end
 
 

data/lib/docker_builder/manager_swarm.rb

@@ -19,6 +19,9 @@ module DockerBuilder
       destroy_service(server_name, settings)
 
 
+      # prepare
+      create_volumes_dirs(settings)
+
       # create service
       docker_opts = settings.attributes['docker']
 
@@ -42,6 +45,15 @@ module DockerBuilder
     end
 
 
+    # volumes
+    def self.create_volumes_dirs(settings)
+      settings.docker_volumes.each do |r|
+        dirpath = "#{r[0]}"
+        if !Dir.exists?(dirpath)
+          FileUtils.mkdir_p(dirpath) rescue nil
+        end
+      end
+    end
 
     # helpers
 

data/lib/docker_builder/server_settings.rb

@@ -244,6 +244,12 @@ class ServerSettings
   end
 
 
+  ###
+  def is_swarm_mode?
+    v = attributes["docker"]["swarm_mode"]
+    return false if v.nil?
+    return v
+  end
 
   ###
   def [](key)

data/lib/docker_builder/version.rb

@@ -1,3 +1,3 @@
 module DockerBuilder
-  VERSION = "0.1.25"
+  VERSION = "0.1.26"
 end

data/readme.md

@@ -484,7 +484,7 @@ it will NOT build a new Docker image.
 
 * packer - https://github.com/mitchellh/packer
 
-Packer is a tool for creating identical machine images for multiple platforms from a single source configuration.
+Packer is a tool for creating machine images for multiple platforms from a single source configuration.
 
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-builder
 version: !ruby/object:Gem::Version
-  version: 0.1.25
+  version: 0.1.26
 platform: ruby
 authors:
 - Max Ivak
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-23 00:00:00.000000000 Z
+date: 2017-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler