docker-builder 0.1.8 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 412cb451008bc9ef839d29b6abf7cf5f9cc93cd0
-  data.tar.gz: a9c7a804eaeb5687ecbce90ae2d95a722960f0b1
+  metadata.gz: 85407e9452d3d1583bfc843e049e685916c2ff4a
+  data.tar.gz: 32eb773b8de175a3eaaf18103ab362f85ac4cc9d
 SHA512:
-  metadata.gz: a3e664c540327c97127f2539bf0312002102230cbb9af8d5fde5a8f626c174e4aeea22461d155277e871b02806fd50430cef4faa2ea19d256fdea95d3751b19e
-  data.tar.gz: caf998c7941bc0e8c8bff504f4bfa3c57f0b2c11bd3eaea4346efddad9fbbff62c5a6a7843b20b69beb7a89cb171fdf14bf91f75947a8910f52a138be1a1362c
+  metadata.gz: aba259c631e9de324450d780b5d3b4ed6c440e03ec7cc9d4f9e8a9f8a06407a2c14e5f40b21eb5f8e999ea3a9da542d08ffcb63cc1edcaf5aaef9cd7d42eb1cb
+  data.tar.gz: db0a3b37091c2ff3421df6a139e655f72b308802d4c533df5b969d9d9df7200a069997ee72f91297deaadce679cdb42f928d8fee6fc0c7a5df88ac40d59a9813

data/examples/example-nginx/servers/nginx/config.rb

@@ -18,8 +18,9 @@ add 'install', {
         'script' => 'install_host',
     },
     "node" => {
-        'script_type' => 'chef_recipe',
-        'script' => 'install',
+        #'script_type' => 'chef_recipe',
+        'script_type' => 'shell',
+        #'script' => 'install',
     }
 
 

data/examples/example-nginx/servers/nginx/scripts/install.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+echo '1' > /tmp/1.txt

data/lib/docker_builder/cli.rb

@@ -40,7 +40,7 @@ class CLI < Thor
     puts "building..."
 
     opts = options
-    #puts "opt from command line: #{options.inspect}"
+    puts "opt from command line: #{options.inspect}"
 
 
     warnings = false
@@ -56,7 +56,7 @@ class CLI < Thor
       #exit
 
       Config.servers.each do |name, opts|
-        server_settings = Settings.load_settings_for_server(name, opts)
+        server_settings = Settings.load_settings_for_server(name)
 
         #puts "s: #{server_settings.inspect}"
         #exit
@@ -135,7 +135,7 @@ class CLI < Thor
       puts "config: #{Config.inspect}"
 
       Config.servers.each do |name, opts|
-        server_settings = Settings.load_settings_for_server(name, opts)
+        server_settings = Settings.load_settings_for_server(name)
 
         puts "s: #{server_settings.inspect}"
         exit
@@ -198,7 +198,7 @@ class CLI < Thor
       Config.load(options)
 
       Config.servers.each do |name, opts|
-        server_settings = Settings.load_settings_for_server(name, opts)
+        server_settings = Settings.load_settings_for_server(name)
 
         Manager.destroy_container(name, server_settings)
         Manager.run_container(name, server_settings)
@@ -258,7 +258,7 @@ class CLI < Thor
       Config.load(options)
 
       Config.servers.each do |name, opts|
-        server_settings = Settings.load_settings_for_server(name, opts)
+        server_settings = Settings.load_settings_for_server(name)
 
         Manager.destroy_container(name, server_settings)
       end
@@ -274,6 +274,65 @@ class CLI < Thor
   end
 
 
+
+
+  ##
+  # [stop]
+  #
+  #
+  desc 'stop', 'Stop Docker container(s)'
+
+  long_desc <<-EOS.gsub(/^ +/, '')
+  Stop containers.
+  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  => '',
+                :desc     => 'Path to your config.rb file.'
+
+  def stop
+    puts "stopping..."
+
+    opts = options
+
+    warnings = false
+    errors = false
+
+
+    servers = nil
+    begin
+      Config.load(options)
+
+      Config.servers.each do |name, opts|
+        server_settings = Settings.load_settings_for_server(name)
+
+        Manager.stop_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
+
   ### generators
 
   ##

data/lib/docker_builder/config.rb

@@ -36,8 +36,11 @@ module DockerBuilder
 
       # Loads the user's +config.rb+ and all model files.
       def load(opts = {})
+        puts "update opts from #{opts}"
         update(opts)  # from the command line
 
+        puts "config file: #{config_file}"
+
         unless File.exist?(config_file)
           #raise Error, "Could not find configuration file: '#{config_file}'."
           raise "Could not find configuration file: '#{config_file}'."
@@ -132,8 +135,17 @@ module DockerBuilder
 
         # options
         opts.each do |name, v|
+          #puts "set var #{name} == #{v}"
           set_variable(name, v)
         end
+
+        # config file
+        set_path_variable("config_file", options['config_file'], DEFAULTS['config_file'], new_root)
+
+
+
+
+        puts "config == #{config_file}"
       end
 
       # Sets the @root_path to the given +path+ and returns it.

data/lib/docker_builder/manager.rb

@@ -132,7 +132,15 @@ 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']})
+
+      # provision with shell script
+      run_shell_script_in_container(settings, "install.sh")
+
     else
+      # no script for provision
       #_run_container_docker(settings)
 
       # docker run
@@ -293,6 +301,20 @@ class Manager
     return true
   end
 
+
+  ### stop container
+
+  def self.stop_container(server_name, settings)
+    puts "stopping container #{server_name}..."
+
+    #
+    cmd %Q(docker stop #{settings.container_name} )
+
+    #
+    return true
+  end
+
+
   ### run task on running container
   def self.exec_task(server_name, recipe_name)
     #raise 'not implemented'
@@ -330,14 +352,28 @@ class Manager
   end
 
 
+  ### helpers - shell
+
+  def self.run_shell_script_in_container(settings, script_name)
+    script_path = settings.make_path_full("scripts/#{script_name}")
+
+    # copy
+    cmd %Q(cd #{Config.root_path} && docker cp #{script_path} #{settings.container_name}:/tmp/#{script_name} )
+
+    # exec
+    cmd %Q(docker exec #{settings.container_name} chmod +x /tmp/#{script_name} )
+    cmd %Q(docker exec #{settings.container_name} /tmp/#{script_name} )
+  end
+
+
   ### helpers - chef
 
   def self.run_chef_recipe(settings, recipe_rb)
-    cmd %Q(cd #{Config.root_path} && SERVER_NAME=#{settings.name} SERVER_PATH=#{settings.dir_server_root} chef exec chef-client -z -N #{settings.image_name} -j #{settings.filename_config_json} -c #{chef_config_knife_path} #{chef_recipe_path(recipe_rb)} )
+    cmd %Q(cd #{Config.root_path} && SERVER_NAME=#{settings.name} SERVER_PATH=#{settings.dir_server_root} chef exec chef-client -z -N #{settings.container_name} -j #{settings.filename_config_json} -c #{chef_config_knife_path} #{chef_recipe_path(recipe_rb)} )
   end
 
   def self.run_chef_recipe_server_recipe(settings, server_recipe)
-    cmd %Q(cd #{Config.root_path} && SERVER_NAME=#{settings.name} SERVER_PATH=#{settings.dir_server_root} chef exec chef-client -z -N #{settings.image_name} -c #{chef_config_knife_path} --override-runlist 'recipe[#{settings.name}::#{server_recipe}]' )
+    cmd %Q(cd #{Config.root_path} && SERVER_NAME=#{settings.name} SERVER_PATH=#{settings.dir_server_root} chef exec chef-client -z -N #{settings.container_name} -c #{chef_config_knife_path} --override-runlist 'recipe[#{settings.name}::#{server_recipe}]' )
   end
 
 

data/lib/docker_builder/server_settings.rb

@@ -250,6 +250,11 @@ class ServerSettings
     File.expand_path("clients/#{image_name}.json", dir_server_root)
   end
 
+  ###
+
+  def make_path_full(path)
+    File.expand_path("#{path}", dir_server_root)
+  end
 
 end
 

data/lib/docker_builder/version.rb

@@ -1,3 +1,3 @@
 module DockerBuilder
-  VERSION = "0.1.8"
+  VERSION = "0.1.11"
 end

data/readme.md

@@ -1,32 +1,115 @@
 # Docker builder
 
-Tool to build and install Docker containers with Chef, Dockerfile and other tools.
+Tool to build and install Docker containers with Chef, Dockerfile and other provisioning tools.
 
-Config files are in Ruby.
+Features:
+* Config files are in Ruby.
+* Manage complexity of running Docker containers for your environment in one place.
+* Manage multiple containers
 
-Manage complexity of running Docker containers for your environment in one place.
 
+Other tools:
+* docker-composer - with configs in yml
 
-# Basic usage
 
-## Server with Chef provisioning
+
+# Overview
+
+
+Build Docker image:
+* from Dockerfile
+* Chef provisioning (machine_image) 
+
+Provision during installation container on the host machine by:
+* running shell script inside container
+* running Chef script inside container with Chef provisioning
+
+
+
+
+# Quickstart
+
+We will build and run a simple Docker container with Nginx server.
+
+* install gem
+
+```
+gem install docker-builder
+```
+
 
 * generate directory structure using generator
+
 ```
 docker-builder generate --name=nginx --type=chef
 ``` 
 
-it will create a folder `nginx`
+it will create a folder `nginx` with necessary directory structure inside.
+
 
 * in the folder edit config file `config.rb` with common settings
 
 ```
+common({
+    'prefix' => "example-",
+    'image_prefix' => 'example-',
+    'dir_data' => '/disk3/data/my-examples/',
+
+})
+
+servers({
+    'nginx'=>{
+        # some server options here
+    },
+
+
+})
+
+
+base({
+
+})
+
 
 ```
 
 * edit custom settings for the server in file `servers/nginx/config.rb`
  
 ```
+
+add 'build', {
+    "image_name" => "nginx",
+    'build_type' => 'chef',
+    "base_image" => {        "name" => "nginx",        "repository" => "nginx",        "tag" => "1.10"    },
+
+}
+
+add 'install', {
+    "host" => {      'script_type' => 'chef_recipe',       'script' => 'install_host',    },
+    "node" => {       'script_type' => 'chef_recipe',       'script' => 'install',    }
+}
+
+add 'docker', {
+    "command"=> "nginx -g 'daemon off;'",
+    'ports' => [
+        [8080,80],
+    ],
+    'volumes' => [
+        ['html', '/usr/share/nginx/html'],
+        ['log/nginx', '/var/log/nginx/'],
+    ],
+    'links' => [    ]
+}
+
+add 'attributes', {
+  'nginx' =>{
+      "sitename" =>"mysite.local"
+  },
+
+
+}
+
+
 ```
 
 * build Docker image
@@ -46,6 +129,14 @@ docker-builder up
 * check container is running
 ```
 docker ps
+
+# see container named example-nginx
+```
+
+* access container 
+
+```
+docker exec -ti example-nginx /bin/bash
 ```
 
 * access container from browser
@@ -56,7 +147,17 @@ http://localhost:8080
 
 
 
-# Overview
+
+
+
+# Basic usage
+
+# Provision wich shell script
+
+* put scripts in `/path/to/project/ <<server_name>> / scripts / install.sh`
+
+
+# Provisioning with Chef
 
 Process of building and running container on the host machine:
 * Build Docker image
@@ -78,22 +179,59 @@ Process of building and running container on the host machine:
 * Destroy image
 
 
+## Install server with Chef provisioning
+ 
+* generate directory structure using generator
+```
+docker-builder generate --name=nginx --type=chef
+``` 
 
-# Installation
+it will create a folder `nginx`
+
+* in the folder edit config file `config.rb` with common settings
+
+```
+
+```
+
+* edit custom settings for the server in file `servers/nginx/config.rb`
+ 
+```
+```
+
+* build Docker image
+
+```
+# from the folder with project
+
+docker-builder build
+```
 
-Add this line to your application's Gemfile:
+* run container
 
-```ruby
-gem 'docker-builder'
+```
+docker-builder up
 ```
 
-And then execute:
+* check container is running
+```
+docker ps
+```
 
-    $ bundle
+* access container from browser
 
-Or install it yourself as:
+```
+http://localhost:8080
+```
 
-    $ gem install docker-builder
+
+# Installation
+
+
+Install gem:
+```
+$ gem install docker-builder
+```
 
 
 
@@ -175,7 +313,7 @@ in folder with servers:
 
 cookbook_path cookbook_path+[
     '/path/to/my/cookbooks',
-    '/path/to/my//other/cookbooks',
+    '/path/to/my/other/cookbooks',
 ]
 
 ```
@@ -254,3 +392,24 @@ data for nginx server:
 * packer - https://github.com/mitchellh/packer
 
 Packer is a tool for creating identical machine images for multiple platforms from a single source configuration.
+
+
+
+# Docker options for running container
+
+* additional options for docker run command 
+* hostname
+
+```
+{
+..
+servers({
+    'zookeeper'=>{
+    ...
+        'docker'=> {
+            ...
+            'run_extra_options'=>'--hostname zookeeper'
+        }
+}
+```
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-builder
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.11
 platform: ruby
 authors:
 - Max Ivak
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-29 00:00:00.000000000 Z
+date: 2016-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,6 +67,7 @@ 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
@@ -103,13 +104,13 @@ files:
 - examples/example-nginx/servers/nginx/cookbooks/nginx/templates/index.html.erb
 - examples/example-nginx/servers/nginx/cookbooks/nginx/templates/nginx-sites/default.conf.erb
 - examples/example-nginx/servers/nginx/readme.md
+- examples/example-nginx/servers/nginx/scripts/install.sh
 - examples/example-nginx/temp/ex_nginx.json
 - examples/example-nginx/temp/nginx.json
 - exe/docker-builder
 - install_local.sh
 - lib/docker_builder.rb
 - lib/docker_builder/chef/.chef/knife.rb
-- lib/docker_builder/chef/bootstrap_local.sh
 - lib/docker_builder/chef/chef_build_image.copy0.rb
 - lib/docker_builder/chef/chef_build_image.rb
 - lib/docker_builder/chef/chef_destroy_container.rb