docker-builder 0.1.30 → 0.1.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 256e96eb177d0c4fd4fbc0f79a06d3ab615c3f16
-  data.tar.gz: 648599fd31fa6686b2b67c1d577c40896041873e
+  metadata.gz: 31f8f20a4c06dcd857f30ecd4c51150aa00696e1
+  data.tar.gz: 1e421d96878d8ba19816b26e6244e6453530c3c9
 SHA512:
-  metadata.gz: 10f38caa907ddf6e402031bb37e0fbe644c1a70ac49eefcfc57225725425b81b9172cb7daaa036abfbcb4c856c2dcba95b578181db92d219730f4a6f4f76944f
-  data.tar.gz: ae32df32af0100d09903fb461b887af2d65a0b691976dbba273002a9e18be3cf7da8346383bd5252eb25b3be215e7518bf1b48f4d14f0f7ac3309810b9ab5483
+  metadata.gz: 1661019db55a933fb618017c8a6ae4c397fdd2e4a70685393a69fe01ad2779ebbbd4dfe32ef2076bb48c9e7924e299f6e13ab27395e75cca968acede7ca2037e
+  data.tar.gz: 29260015299048be1cd780983f4631b5d787c365a0fd7f3b1ff2a73973ba1742819ff0b0131bd9b212169cc0673daf1ef2a7d99edbea0b59681a5504c0900c68

data/install_local.sh

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

data/lib/docker_builder/manager.rb

@@ -162,12 +162,15 @@ class Manager
     # 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})
+    # networks
+    networks = settings['docker'].fetch('network', {}).fetch('networks', [])
+    if networks
+      networks.each do |net|
+        ip = net['ip']
+        s_ip = "--ip #{ip}" if ip
+        #puts %Q(docker network connect #{s_ip}  #{net['net']} #{settings.container_name})
+        cmd %Q(docker network connect #{s_ip}  #{net['net']} #{settings.container_name})
+      end
     end
   end
 
@@ -184,22 +187,21 @@ class Manager
 
 
   def self.setup_container_after_start(settings)
-    # second network
-    network2 = settings['docker']['network_secondary']
 
-    # fixes
-    if network2
-      gateway = network2['gateway']
+    # default gateway
+    network= settings['docker']['network']
+    if network
+      gateway = network['default_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)
+        #cmd %Q(docker exec #{settings.container_name} ip route change default via #{gateway} dev eth1)
+        cmd %Q(docker exec #{settings.container_name} ip route change default via #{gateway})
       end
-
     end
 
+
+
     # fix hosts
     container_hosts = settings['docker']['hosts'] || []
     container_hosts.each do |r|

data/lib/docker_builder/version.rb

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

data/readme.md

@@ -184,6 +184,57 @@ http://localhost:8080
 
 
 
+# Install Docker container. Overview
+
+Process:
+* Create container - docker create
+* setup network and other settings for container
+
+* run provision to setup host machine. Script is running on the host machine.
+```
+{   
+'install'=>
+    { 
+        'host'=> {type: 'ruby', ..} 
+    }
+    ...
+}
+```
+
+* run provision to setup not running container. Run script which can copy/change files in container.
+```
+{   
+'install'=>
+    { 
+        'setup'=> {type: 'ruby'} 
+    }
+    ...
+}
+```
+* 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.
+```
+{   
+'install'=>
+    { 
+        'bootstrap'=> {type: 'chef'} 
+    }
+```
+
+* provision to init container. Run script every time after container starts. Script should be located inside container.
+```
+{   
+'install'=>
+    { 
+        'init'=> {type: 'chef'} 
+    }
+```
+
+* Use lock file to make sure the container does not start until the provision is finished.
+
+
+
 
 
 # Basic usage
@@ -621,3 +672,74 @@ RUN chmod +x /opt/bootstrap/bootstrap.sh
 
 ```
 
+
+
+# Run docker container
+
+## 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'},
+   }
+   
+}
+
+}
+```
+
+
+
+## multiple networks
+
+```
+'docker'=> {
+..
+'network': {
+   networks: {
+      {net: 'mybridge1', ip: '10.1.0.12'},
+      {net: 'my_overlay1', ip: '51.1.0.15'},
+   }
+   
+}
+
+}
+```
+
+* example:
+
+* create networks
+```
+# bridge
+
+# macvlan
+```
+
+see docker networks:
+```
+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
+```
+ip route
+
+...
+
+```

metadata

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