docker-builder 0.1.29 → 0.1.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25b87b6681068503f2f6d0d8ec3d6173e0af7381
-  data.tar.gz: c18e85a54b8be929901184b925df68a0d9d7fd8a
+  metadata.gz: 256e96eb177d0c4fd4fbc0f79a06d3ab615c3f16
+  data.tar.gz: 648599fd31fa6686b2b67c1d577c40896041873e
 SHA512:
-  metadata.gz: 63ed4d061457d2d857759c42bce8e9997a0ca0d632232a2681441db91cbbc7465e64a8ee06d322aa47e63442f692e3cd7a8aba71a68536657543e84a406e9b58
-  data.tar.gz: 44f5c0cfbb9fbe3871f0160095dc4efb9e82ac3e96ebcbff696f4cca40b261d3849728bd680c79c4f8ced2b6a6df98803463ac0fab227dfa22e4d21499bd1ad7
+  metadata.gz: 10f38caa907ddf6e402031bb37e0fbe644c1a70ac49eefcfc57225725425b81b9172cb7daaa036abfbcb4c856c2dcba95b578181db92d219730f4a6f4f76944f
+  data.tar.gz: ae32df32af0100d09903fb461b887af2d65a0b691976dbba273002a9e18be3cf7da8346383bd5252eb25b3be215e7518bf1b48f4d14f0f7ac3309810b9ab5483

data/install_local.sh

@@ -1,2 +1,2 @@
 gem build docker-builder.gemspec
-gem install ./docker-builder-0.1.29.gem
+gem install ./docker-builder-0.1.30.gem

data/lib/docker_builder/cli.rb

@@ -217,6 +217,61 @@ class CLI < Thor
   end
 
 
+  ##
+  # [start]
+  #
+  #
+  desc 'start', 'Start Docker container'
+
+  long_desc <<-EOS.gsub(/^ +/, '')
+  Start Docker container.
+  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 start
+    puts "starting..."
+
+    opts = options
+
+    warnings = false
+    errors = false
+    begin
+      Config.load(options)
+
+      Config.servers.each do |name, opts|
+        server_settings = Settings.load_settings_for_server(name)
+
+        Manager.start_container(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]

data/lib/docker_builder/manager.rb

@@ -148,43 +148,9 @@ class Manager
 
 
     # start
-    start_container(settings)
+    start_container(name, settings)
 
 
-    # provision after start
-    install_node_script_type = (settings['install']['node']['script_type'] rescue nil)
-    install_bootstrap_script_type = (settings['install']['bootstrap']['script_type'] rescue nil)
-
-    if install_node_script_type && install_node_script_type=='chef_recipe'
-      # run container and provision with chef
-      #_run_container_chef(settings)
-
-      # ???
-      #_provision_container_chef_recipe(settings)
-
-    elsif install_node_script_type && install_node_script_type=='shell'
-      # docker run
-      #create_and_run_container(settings)
-
-      # provision with shell script
-      run_shell_script_in_container(settings, "install.sh")
-
-    else
-      # no script for provision
-      #_run_container_docker(settings)
-
-      # docker run
-      #create_and_run_container(settings)
-
-    end
-
-    # bootstrap
-    if install_bootstrap_script_type && install_bootstrap_script_type=='shell'
-      script = settings['install']['bootstrap']['script'] || '/opt/bootstrap/bootstrap.sh'
-
-      # bootstsrap with shell script
-      run_bootsrap_shell_script_in_container(settings, script)
-    end
 
 
     true
@@ -205,22 +171,18 @@ class Manager
     end
   end
 
-  def self.start_container(settings)
+  def self.start_container(name, settings)
     # start
     cmd %Q(docker start #{settings.container_name})
 
     # setup
     setup_container_after_start(settings)
-  end
-
 
-  def self.run_bootsrap_shell_script_in_container(settings, script_path)
-    # exec
-    cmd %Q(docker exec #{settings.container_name} #{script_path} )
+    # provision after start
+    run_provision_after_start(settings)
   end
 
 
-
   def self.setup_container_after_start(settings)
     # second network
     network2 = settings['docker']['network_secondary']
@@ -230,6 +192,8 @@ class Manager
       gateway = network2['gateway']
 
       if gateway
+        puts "setup network gateway"
+
         # fix default gateway
         cmd %Q(docker exec #{settings.container_name} ip route change default via #{gateway} dev eth1)
       end
@@ -245,6 +209,56 @@ class Manager
   end
 
 
+
+  def self.run_provision_after_start(settings)
+
+    install_node_script_type = (settings['install']['node']['script_type'] rescue nil)
+    install_bootstrap_script = (settings['install']['bootstrap']['script'] rescue nil)
+
+    if install_node_script_type && install_node_script_type=='chef_recipe'
+      # run container and provision with chef
+      #_run_container_chef(settings)
+
+      # ???
+      #_provision_container_chef_recipe(settings)
+
+    elsif install_node_script_type && install_node_script_type=='shell'
+      # docker run
+      #create_and_run_container(settings)
+
+      # provision with shell script
+      run_shell_script_in_container(settings, "install.sh")
+
+    else
+      # no script for provision
+      #_run_container_docker(settings)
+
+      # docker run
+      #create_and_run_container(settings)
+
+    end
+
+    # bootstrap
+    if install_bootstrap_script
+      #script = settings['install']['bootstrap']['script'] || '/opt/bootstrap/bootstrap.sh'
+
+      # bootstsrap with shell script
+      run_bootsrap_shell_script_in_container(settings, install_bootstrap_script)
+    end
+
+
+    true
+  end
+
+
+  def self.run_bootsrap_shell_script_in_container(settings, script_path)
+    # exec
+    cmd %Q(docker exec #{settings.container_name} #{script_path} )
+  end
+
+
+
+
   ### systemd service
 
   def self._install_service_container(settings)

data/lib/docker_builder/version.rb

@@ -1,3 +1,3 @@
 module DockerBuilder
-  VERSION = "0.1.29"
+  VERSION = "0.1.30"
 end

data/readme.md

@@ -480,6 +480,18 @@ it will NOT build a new Docker image.
 
 
 
+# Start Docker container
+
+docker-builder start -s server_name
+
+it starts docker container which was previously created.
+
+Process:
+* Start docker container container with `docker start ..`
+* Provision container
+
+
+
 # Other tools
 
 * packer - https://github.com/mitchellh/packer
@@ -584,3 +596,28 @@ Process:
 * docker start 
 * when container starts it runs /etc/boostrap which
     * runs chef-client to provision server first time
+
+
+
+## Bootstrap with shell script
+
+* Dockerfile
+
+* include script /opt/bootstrap/bootstrap.sh in container
+```
+ADD scripts/bootstrap.sh /opt/bootstrap/
+
+RUN chmod +x /opt/bootstrap/bootstrap.sh
+
+```
+
+* config
+
+```
+'install' => {
+    "bootstrap" => {  'script_type' => 'shell',     'script' => '/opt/bootstrap/bootstrap.sh',  },
+},
+
+
+```
+

metadata

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