docker-builder 0.1.18 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4320cc85611a30b29aee60fab02a876f69b0be1
-  data.tar.gz: 37d32f80ee68ecf05165d11b49df8d489c2dc247
+  metadata.gz: 9decd6798b5b0e74debf337079619b93a7f9b55b
+  data.tar.gz: bb395e7fd4f4ec4f7401e72956f2d6e255ec1125
 SHA512:
-  metadata.gz: fb167023690c10af147ee0a9d3f363f38c9e9afb3a868ba59c354ef32d828fe6abee975d1e49ec86402c08d1b1ce1df4c6254d4778a3a7f0a5c589100a355b79
-  data.tar.gz: 0bb3ed630bc2a25674d1c0ae3d0b3f962ba9c6aa2b8e9ce006c142bdd8748a88e68aee75bb41819a3b1e42674e019a38212742e5b6dbbe2dcd8aad9728969a08
+  metadata.gz: a6be299c8ce18ac07a5948551e4e5e41e2c125a25eb57cf2f63b5159166635e82c482d3a6f2a7093703880d6ea89f362a08d1aca8ebc56b57cedd92ee06582f7
+  data.tar.gz: 04ad6e29653eb83590d8685ebf8ab73644af52e4ea8b46dcce1b5fcd2f23ed95d86fccd4069f31e84bd71333d268f3d11022276e56d58a3285cf61343e11ed16

data/examples/example-swarm-redis/config.rb

@@ -0,0 +1,61 @@
+common({
+    'prefix' => "example-",
+    'image_prefix' => 'example-',
+    'dir_data' => '/disk3/data/my-examples/',
+
+})
+
+servers({
+    'redis'=>{
+
+        'build' => {
+            "image_name" => "redis",
+            'build_type' => 'none',
+
+            "base_image" => {
+                "name" => "redis",
+                "repository" => "redis",
+                "tag" => "3.2.4"
+
+            },
+
+        },
+
+        'install'=> {
+        },
+
+    'docker'=> {
+        #"command"=> "",
+        'ports' => [
+            [6379,80],
+        ],
+        'volumes' => [
+        ],
+        'links' => [
+        ],
+
+        # network
+        #"ip"=>"10.1.0.144",
+        #"net"=> "pub_net",
+
+        # for swarm
+        "swarm_network"=> "pub_net",
+        #"swarm_options" => ""
+        "swarm_options" => "--replicas=1 --restart-max-attempts=1"
+        #"swarm_options" => "-e constraint:node==mmxpc "
+    # --net=pub_net --ip=10.1.0.131
+
+    },
+
+    'attributes'=> {
+    }
+
+    }, # / redis
+
+
+})
+
+
+base({
+
+})

data/examples/example-swarm-redis/readme.md

@@ -0,0 +1,10 @@
+* create swarm and network
+docker swarm init ...
+
+
+* run in swarm mode
+
+docker-builder up_swarm -s redis
+
+* destroy
+docker-builder up_swarm -s redis

data/install_local.sh

@@ -1,2 +1,2 @@
 gem build docker-builder.gemspec
-gem install ./docker-builder-0.1.18.gem
+gem install ./docker-builder-0.1.19.gem

data/lib/docker_builder.rb

@@ -11,8 +11,10 @@ module DockerBuilder
   # Require Backup base files
   %w{
     config
+    command
     cli
     server_settings
     manager
+    manager_swarm
   }.each {|lib| require File.join(LIBRARY_PATH, lib) }
 end

data/lib/docker_builder/cli.rb

@@ -329,6 +329,120 @@ 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
+
+
+
   ##
   # [clear_cache]
   #

data/lib/docker_builder/command.rb

@@ -0,0 +1,16 @@
+module DockerBuilder
+  class Command
+
+    def self.cmd(s)
+      puts "running: #{s}"
+
+      res = nil
+      Bundler.with_clean_env do
+        res = `#{s}`
+      end
+
+      puts "#{res}"
+    end
+
+  end
+end

data/lib/docker_builder/manager.rb

@@ -361,14 +361,7 @@ class Manager
   ###
 
   def self.cmd(s)
-    puts "running: #{s}"
-
-    res = nil
-    Bundler.with_clean_env do
-      res = `#{s}`
-    end
-
-    puts "#{res}"
+    Command.cmd(s)
   end
 
 

data/lib/docker_builder/manager_swarm.rb

@@ -0,0 +1,46 @@
+module DockerBuilder
+  class ManagerSwarm
+
+    def self.destroy_service(server_name, settings)
+      puts "destroying service #{server_name}..."
+
+      #
+      cmd %Q(docker service rm #{settings.container_name} )
+
+      #
+      return true
+    end
+
+
+    def self.create_service(server_name, settings={})
+      puts "create swarm service.."
+
+      # destroy
+      destroy_service(server_name, settings)
+
+
+      # create service
+      docker_opts = settings.attributes['docker']
+
+      run_opts = []
+      run_opts << "--network #{docker_opts['swarm_network']}" if docker_opts['swarm_network']
+      run_opts << docker_opts['swarm_options']
+
+      cmd %Q(docker service create \
+--name #{settings.container_name} #{settings.docker_ports_string} \
+#{run_opts.join(' ')} \
+#{settings.image_name} #{settings['docker']['command']}
+)
+    end
+
+
+
+    # helpers
+
+    def self.cmd(s)
+      Command.cmd(s)
+    end
+
+
+  end
+end

data/lib/docker_builder/version.rb

@@ -1,3 +1,3 @@
 module DockerBuilder
-  VERSION = "0.1.18"
+  VERSION = "0.1.19"
 end

data/readme.md

@@ -485,3 +485,25 @@ Sometimes you need to clear cache with server info in chef-zero server
 ```
 docker-builder clear_cache
 ```
+
+
+# Run in swarm mode
+
+* commands
+
+docker-builder :up_swarm
+
+docker-builder :destroy_swarm
+
+
+* config
+
+```
+docker: {
+    # options here...
+}
+```
+
+* swarm_network - network name
+* swarm_options - options to pass to docker service create command
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker-builder
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.19
 platform: ruby
 authors:
 - Max Ivak
@@ -67,7 +67,6 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- bootstrap_local.sh
 - docker-builder.gemspec
 - examples/example-apps-php/.chef/knife.rb
 - examples/example-apps-php/config.rb
@@ -119,6 +118,8 @@ files:
 - examples/example-nginx/servers/nginx/scripts/install.sh
 - examples/example-nginx/temp/ex_nginx.json
 - examples/example-nginx/temp/nginx.json
+- examples/example-swarm-redis/config.rb
+- examples/example-swarm-redis/readme.md
 - exe/docker-builder
 - install_local.sh
 - lib/docker_builder.rb
@@ -135,6 +136,7 @@ files:
 - lib/docker_builder/chef/config_run_install_container_service.json
 - lib/docker_builder/chef/install_container_service.rb
 - lib/docker_builder/cli.rb
+- lib/docker_builder/command.rb
 - lib/docker_builder/config.rb
 - lib/docker_builder/config/dsl.rb
 - lib/docker_builder/config/helpers.rb
@@ -148,6 +150,7 @@ files:
 - lib/docker_builder/cookbooks/docker-builder/recipes/provision_container.rb
 - lib/docker_builder/cookbooks/docker-builder/resources/mycontainer.rb
 - lib/docker_builder/manager.rb
+- lib/docker_builder/manager_swarm.rb
 - lib/docker_builder/server_settings.rb
 - lib/docker_builder/version.rb
 - lib/templates/example-chef/.chef/knife.rb

data/bootstrap_local.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-chef exec knife zero bootstrap 10.1.0.12 --node-name server-api-local --overwrite --ssh-user mmx --ssh-password Galactic1 --sudo --use-sudo-password 2>&1