docker-builder 0.1.50 → 0.1.55

data/lib/docker_builder/version.rb

@@ -1,3 +1,3 @@
 module DockerBuilder
-  VERSION = "0.1.50"
+  VERSION = "0.1.55"
 end

data/readme.md

@@ -193,47 +193,52 @@ Process:
 * run provision to setup host machine. Script is running on the host machine.
 ```
 {   
-'provision'=>[
-    { 
-        'host'=> {type: 'ruby', ..} 
-    },..
+'provision'=>{
+    'setup' => [
+        {type: 'host', ..}, 
+        ..
     ]
     ...
 }
 ```
 
-* run provision to setup not running container. Run script which can copy/change files in container.
+* run provision to setup created (not running) container. 
+Run script to copy/update files in container.
+
 ```
 {   
-'provision'=>[
-    { 
-        'setup'=> {type: 'ruby'} 
-    },
-    ..
+'provision'=>{
+   'setup'=> [
+        {type: 'ruby', <<script_options>>}, 
+        ..
     ]
     ...
 }
 ```
+
 * run container with `docker run`. Specify env variables, hostname and other options
 * first provision of container - bootstrap script. Run script from inside running container only once. 
 Script should be located inside container.
 ```
 {   
-'provision'=>[
-    { 
-        'bootstrap'=> {type: 'chef'} 
-    },..
+'provision'=>{
+   'bootstrap'=> [
+        {type: 'chef', ..},
+        ..
     ]
+}
 ```
 
-* provision to init container. Run script every time after container starts. Script should be located inside container.
+* provision to initialize container. 
+Run script every time after container starts. Script should be located inside container.
 ```
 {   
-'provision'=>[
-    { 
-        'init'=> {type: 'chef'} 
-    },..
+'provision'=>{
+    'init'=> [
+        {type: 'chef'},
+        ..
     ]
+}
 ```
 
 * Use lock file to make sure the container does not start until the provision is finished.
@@ -655,28 +660,35 @@ my-test-redis
 
     
 
+# Provision
 
-# Bootstrap
+## Setup container
 
-* first provision of container
+### Setup container with shell script
 
+* run script from the host
 
-## Provision with chef
+```
+'provision' => {
+    "setup" => [
+        {  'type' => 'shell',     'script' => 'scripts/mysetup.sh',  },
+     ]
+},
+```
 
-docker-builder up -s server_name
+* it will run the script
+```
+scripts/mysetup.sh
+```
 
-Process:
-* docker create with docker options
-    * entrypoint: /etc/bootstrap
-* generate config with node attributes for chef and save it to temp/boostrap-__server__.json
-* copy config file to container to /opt/bootstrap/config.json
-* docker start 
-* when container starts it runs /etc/boostrap which
-    * runs chef-client to provision server first time
+## Bootstrap container
+
+* first provision of container
+* provision scripts run only once
 
 
 
-## Bootstrap with shell script
+### Bootstrap with shell script
 
 * Dockerfile
 
@@ -691,64 +703,66 @@ RUN chmod +x /opt/bootstrap/bootstrap.sh
 * config
 
 ```
-'install' => {
-    "bootstrap" => {  'script_type' => 'shell',     'script' => '/opt/bootstrap/bootstrap.sh',  },
+'provision' => {
+    "bootstrap" => [
+        {  'type' => 'shell',     'script' => '/opt/bootstrap/bootstrap.sh',  },
+     ]
 },
 
 
 ```
 
+## Provision with chef
 
+docker-builder up -s server_name
 
-# Run docker container
+Process:
+* docker create with docker options
+    * entrypoint: /etc/bootstrap
+* generate config with node attributes for chef and save it to temp/boostrap-__server__.json
+* copy config file to container to /opt/bootstrap/config.json
+* docker start 
+* when container starts it runs /etc/bootstrap which
+    * runs chef-client to provision server first time
 
-## Network
 
-* config
-```
-'docker'=> {
-..
-'network': {
-    default_gateway: '192.168.1.1',
-   networks: {
-      {net: 'bridge'}, # default docker bridge
-      {net: 'mybridge1', ip: '10.1.0.12'},
-      {net: 'my_overlay1', ip: '51.1.0.15'},
-   }
-   
-}
 
-}
-```
 
 
 
-## remove default network
+# Network
+
+* Docker container can be connected to multiple networks. 
+Container has an IP in each network. 
+
+Docker networks can be created using docker command `docker network create`
+
+
+Docker-builder allows you to manage networks for your container.
+
+
 
-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
 
+
+* connect to multiple networks and specify default gateway
+
+define IP in each network.
+
+it assumes that networks 'my_bridge1' and 'my_overlay1' exist.
+
+
 ```
 'docker'=> {
 ..
 'network': {
+   default_gateway: '192.168.1.1',
    networks: {
-      {net: 'mybridge1', ip: '10.1.0.12'},
+      {net: 'bridge'}, # default docker bridge
+      {net: 'my_bridge1', ip: '10.1.0.12'},
       {net: 'my_overlay1', ip: '51.1.0.15'},
    }
    
@@ -757,13 +771,17 @@ remove default network 'bridge'
 }
 ```
 
-* example:
+in this example container will be connected to three networks:
+     * docker default bridge named 'bridge'
+     * custom docker network named 'my_bridge1' with ip='10.1.0.12'
+     * custom docker network named 'my_overlay1'
+     
+     
 
-* create networks
+create networks:
 ```
-# bridge
-
-# macvlan
+docker network create --driver bridge --subnet=51.1.0.0/16 --gateway=51.1.0.1  my_bridge1
+docker network create -d macvlan --subnet=10.1.0.0/16  --gateway=10.1.0.1 --ip-range=10.1.12.0/24 -o parent=eth0 my_overlay1
 ```
 
 see docker networks:
@@ -772,18 +790,39 @@ docker network ls
 ```
 
 
-in this example container will be connected to three networks:
-     * docker default bridge named 'bridge'
-     * custom docker network named 'mybridge1' with ip='10.1.0.12'
-     * custom docker network named 'my_overlay1'
-     
-
-
-
 * check
 ```
+docker exec -ti mycontainer bash
+
 ip route
 
+# sample output
 ...
 
 ```
+
+
+## remove default Docker bridge network 
+
+
+* Container will be connected to two networks and NOT connected to default Docker 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'},
+   }
+}
+
+}
+```
+
+
+# Examples
+
+* [Nginx with Mysql](https://github.com/maxivak/docker-nginx-mysql-example)
+

data/temp_config.rb

@@ -0,0 +1,17 @@
+
+prefix 'temp-'
+image_prefix ''
+container_prefix ''
+service_prefix ''
+
+server 'nginx' do |s|
+  s.build = {x:1, y:2}
+  s.docker = {a:1, b:2}
+
+end
+
+server 'mysql' do |s|
+  s.build = {x:1, y:2}
+  s.docker = {a:1, b:2}
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-builder
 version: !ruby/object:Gem::Version
-  version: 0.1.50
+  version: 0.1.55
 platform: ruby
 authors:
 - Max Ivak
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-14 00:00:00.000000000 Z
+date: 2017-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -64,62 +64,10 @@ files:
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
-- Rakefile
+- Rakefile_temp
 - bin/console
 - bin/setup
 - docker-builder.gemspec
-- examples/example-apps-php/.chef/knife.rb
-- examples/example-apps-php/config.rb
-- examples/example-apps-php/servers/apps-php/.chef/knife.rb
-- examples/example-apps-php/servers/apps-php/config.rb
-- examples/example-apps-php/servers/apps-php/cookbooks/apps-php/README.md
-- examples/example-apps-php/servers/apps-php/cookbooks/apps-php/metadata.rb
-- examples/example-apps-php/servers/apps-php/cookbooks/apps-php/recipes/build.rb
-- examples/example-apps-php/servers/apps-php/cookbooks/apps-php/recipes/install.rb
-- examples/example-apps-php/servers/apps-php/cookbooks/apps-php/recipes/install_app.rb
-- examples/example-apps-php/servers/apps-php/cookbooks/apps-php/recipes/install_host.rb
-- examples/example-apps-php/servers/apps-php/cookbooks/apps-php/templates/index.html.erb
-- examples/example-apps-php/servers/apps-php/cookbooks/apps-php/templates/nginx-sites/app.conf.erb
-- examples/example-apps-php/servers/apps-php/cookbooks/apps-php/templates/nginx-sites/app.conf.erb.1
-- examples/example-apps-php/servers/apps-php/cookbooks/apps-php/templates/nginx-sites/default.conf.erb
-- examples/example-apps-php/servers/apps-php/readme.md
-- examples/example-apps-php/temp/apps-php.1.json
-- examples/example-base-chef/.chef/knife.rb
-- examples/example-base-chef/config.rb
-- examples/example-base-chef/readme.md
-- examples/example-base-chef/servers/my/.chef/knife.rb
-- examples/example-base-chef/servers/my/config.rb
-- examples/example-base-chef/servers/my/cookbooks/my/README.md
-- examples/example-base-chef/servers/my/cookbooks/my/metadata.rb
-- examples/example-base-chef/servers/my/cookbooks/my/recipes/build.rb
-- examples/example-base-chef/servers/my/cookbooks/my/recipes/install.rb
-- examples/example-base-chef/servers/my/cookbooks/my/recipes/install_host.rb
-- examples/example-base-chef/servers/my/readme.md
-- examples/example-kafka-zookeeper/config.rb
-- examples/example-kafka-zookeeper/servers/kafka/Dockerfile
-- examples/example-kafka-zookeeper/servers/kafka/README.md
-- examples/example-kafka-zookeeper/servers/kafka/files/LICENSE
-- examples/example-kafka-zookeeper/servers/kafka/files/broker-list.sh
-- examples/example-kafka-zookeeper/servers/kafka/files/create-topics.sh
-- examples/example-kafka-zookeeper/servers/kafka/files/download-kafka.sh
-- examples/example-kafka-zookeeper/servers/kafka/files/start-kafka-shell.sh
-- examples/example-kafka-zookeeper/servers/kafka/files/start-kafka.sh
-- examples/example-nginx/config.rb
-- examples/example-nginx/servers/nginx/.chef/knife.rb
-- examples/example-nginx/servers/nginx/config.rb
-- examples/example-nginx/servers/nginx/cookbooks/nginx/README.md
-- examples/example-nginx/servers/nginx/cookbooks/nginx/metadata.rb
-- examples/example-nginx/servers/nginx/cookbooks/nginx/recipes/build.rb
-- examples/example-nginx/servers/nginx/cookbooks/nginx/recipes/install.rb
-- examples/example-nginx/servers/nginx/cookbooks/nginx/recipes/install_host.rb
-- 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
-- examples/example-swarm-redis/config.rb
-- examples/example-swarm-redis/readme.md
 - exe/docker-builder
 - install_local.sh
 - lib/docker_builder.rb
@@ -150,11 +98,12 @@ files:
 - lib/docker_builder/cookbooks/docker-builder/recipes/install_container.rb
 - 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_container.rb
+- lib/docker_builder/manager_image.rb
 - lib/docker_builder/manager_swarm.rb
-- lib/docker_builder/provisioner/provisioner_chef.rb
+- lib/docker_builder/provisioner/base.rb
+- lib/docker_builder/provisioner/chef.rb
 - lib/docker_builder/server_settings.rb
-- lib/docker_builder/temp.rb
 - lib/docker_builder/version.rb
 - lib/templates/example-chef/.chef/knife.rb
 - lib/templates/example-chef/config.rb.erb
@@ -178,6 +127,7 @@ files:
 - temp/cookbooks/temp1/metadata.rb
 - temp/cookbooks/temp1/recipes/build.rb
 - temp/run.sh
+- temp_config.rb
 homepage: https://github.com/maxivak/docker-builder
 licenses:
 - MIT

data/examples/example-apps-php/.chef/knife.rb

@@ -1,6 +0,0 @@
-puts "cookbooks from server: #{cookbook_path}"
-
-cookbook_path cookbook_path+[
-    '/work/chef-repo/cookbooks-common',
-    '/work/chef-repo/cookbooks',
-]

data/examples/example-apps-php/config.rb

@@ -1,19 +0,0 @@
-common({
-    'prefix' => "example-",
-    'image_prefix' => 'example-',
-    'dir_data' => '/disk3/data/my-examples/',
-
-})
-
-servers({
-
-    'apps-php'=>{
-        # some server options here
-    }
-
-})
-
-
-base({
-
-})

data/examples/example-apps-php/servers/apps-php/.chef/knife.rb

@@ -1,2 +0,0 @@
-####
-