beaker-docker 0.1.0 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzBhOGU5ZDAyZTlhNWM3YTBiZmZmYjM4ZjdlMTRmNTVkMzZmZWU3Zg==
+    MjdhOGRmZjc5ODBhODgyMzY1ZTcwZDY5ZmU1ZGVhZjkxMDVmNTE2NQ==
   data.tar.gz: !binary |-
-    ZTYyMTEzMGFiZjFlNzU0ZDdiZTIzNGI0ZDYwOTgwMTAwZWMwNzFmMg==
+    MGNhYTQzMmMyODMyNGJjNzNiOTdhMzhmZmMyNGQyMjE3MGM0ZjdiMA==
 SHA512:
   metadata.gz: !binary |-
-    N2MyYmE4OTMyODRjYTUwMzU1NjFkNjUxNzdlMGMwNDNkMWRhODQ4ZmYyZmVk
-    ZjdkZmY0MzUxYjljZTI0MjUzZmI2ZDZhYWVhODdkZWNhMzZlYTBkMjA0ZGYx
-    YjQ1MmY4YTMzY2MyYWMxZTM4NmI0ZTEzYmEzMzFmNzlmOGVjNWE=
+    YzkzNWJiZmVkYjBjMWI3MjVmMGVmYmJjMDU1ZWZmNDA0NzNkY2EwMGMyOTk4
+    ZDE4YmJkYmE2NDZkOGFlMDY3OTEwZjJiMTQxY2EzYmFmMjMxNWU0ZjZhMzIz
+    ZTIzNzhiYzgwOGE5YmVhYTZjY2VlNGZhNjZkYzNmMDk2ODQ0Y2Y=
   data.tar.gz: !binary |-
-    Nzc4YmJmMjg2Y2ExZDE0NmJiMjI3MWZiMDcwYzAwMTlhODI1MTUxMDc5Njhm
-    NDA2ZGNjM2FiNGYyYTc5YzdlZjM1MzdjZmY4YjY2NDc3NWFlOTVjMjdmMjdi
-    OTAxMmVhOGQ1OGNhMTRlY2MxNzFkMzA2NmZkYjA5NGJjZDIwZjk=
+    NGI0YWViODYwYWRmN2I3ZmUzYTU4MDE2NWJjODc1YTJhZTYxMjMwODNkODA2
+    NWViYzUyMThlOTdjMDJjMDkxODVhYmM5NjVhMWY4MGQwYzU5ZjE0N2ZlYTA5
+    YWY2NGMwNDIyNDhjZDIxOWI4ZDk3ZWZlNmY3NjNiZDUwYWQ2YjQ=

data/lib/beaker-docker/version.rb

@@ -1,3 +1,3 @@
 module BeakerDocker
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/lib/beaker/hypervisor/docker.rb

@@ -70,6 +70,17 @@ module Beaker
         container_opts = {
           'Image' => image_name,
           'Hostname' => host.name,
+          'name' => host.name,
+          'HostConfig' => {
+            'PortBindings' => {
+              '22/tcp' => [{ 'HostPort' => rand.to_s[2..5], 'HostIp' => '0.0.0.0'}]
+            },
+            'PublishAllPorts' => true,
+            'Privileged' => true,
+            'RestartPolicy' => {
+              'Name' => 'always'
+            }
+          }
         }
         container = find_container(host)
 
@@ -102,7 +113,7 @@ module Beaker
         fix_ssh(container) if @options[:provision] == false
 
         @logger.debug("Starting container #{container.id}")
-        container.start({"PublishAllPorts" => true, "Privileged" => true})
+        container.start
 
         # Find out where the ssh port is from the container
         # When running on swarm DOCKER_HOST points to the swarm manager so we have to get the
@@ -114,7 +125,11 @@ module Beaker
           ip = URI.parse(ENV['DOCKER_HOST']).host
         else
           # Swarm or local docker host
-          ip = container.json["NetworkSettings"]["Ports"]["22/tcp"][0]["HostIp"]
+          if in_container?
+            ip = container.json["NetworkSettings"]["Gateway"]
+          else
+            ip = container.json["NetworkSettings"]["Ports"]["22/tcp"][0]["HostIp"]
+          end
         end
 
         @logger.info("Using docker server at #{ip}")
@@ -332,5 +347,10 @@ module Beaker
       end.first
     end
 
+    # return true if we are inside a docker container
+    def in_container?
+      return File.file?('/.dockerenv')
+    end
+
   end
 end

data/spec/beaker/hypervisor/docker_spec.rb

@@ -63,6 +63,7 @@ module Beaker
               },
             ],
           },
+          'Gateway' => '192.0.2.254'
         },
       })
       allow( container ).to receive(:kill)
@@ -180,6 +181,17 @@ module Beaker
           expect( ::Docker::Container ).to receive(:create).with({
             'Image' => image.id,
             'Hostname' => host.name,
+            'name' => host.name,
+            'HostConfig' => {
+              'PortBindings' => {
+                '22/tcp' => [{ 'HostPort' => /\b\d{4}\b/, 'HostIp' => '0.0.0.0'}]
+              },
+              'PublishAllPorts' => true,
+              'Privileged' => true,
+              'RestartPolicy' => {
+                'Name' => 'always'
+              }
+            }
           })
         end
 
@@ -199,6 +211,17 @@ module Beaker
           expect( ::Docker::Container ).to receive(:create).with({
             'Image' => image.id,
             'Hostname' => host.name,
+            'name' => host.name,
+            'HostConfig' => {
+              'PortBindings' => {
+                '22/tcp' => [{ 'HostPort' => /\b\d{4}\b/, 'HostIp' => '0.0.0.0'}]
+              },
+              'PublishAllPorts' => true,
+              'Privileged' => true,
+              'RestartPolicy' => {
+                'Name' => 'always'
+              }
+            }
           })
         end
 
@@ -214,6 +237,16 @@ module Beaker
             'Image' => image.id,
             'Hostname' => host.name,
             'name' => container_name,
+            'HostConfig' => {
+              'PortBindings' => {
+                '22/tcp' => [{ 'HostPort' => /\b\d{4}\b/, 'HostIp' => '0.0.0.0'}]
+              },
+              'PublishAllPorts' => true,
+              'Privileged' => true,
+              'RestartPolicy' => {
+                'Name' => 'always'
+              }
+            }
           })
         end
 
@@ -251,6 +284,7 @@ module Beaker
           expect( ::Docker::Container ).to receive(:create).with({
             'Image' => image.id,
             'Hostname' => host.name,
+            'name' => host.name,
             'HostConfig' => {
               'Binds' => [
                 '/source_folder:/mount_point',
@@ -258,7 +292,15 @@ module Beaker
                 '/different_folder:/different_mount:rw',
                 "#{File.expand_path('./')}:/relative_mount",
                 "#{File.expand_path('local_folder')}:/another_relative_mount",
-              ]
+              ],
+              'PortBindings' => {
+                '22/tcp' => [{ 'HostPort' => /\b\d{4}\b/, 'HostIp' => '0.0.0.0'}]
+              },
+              'PublishAllPorts' => true,
+              'Privileged' => true,
+              'RestartPolicy' => {
+                'Name' => 'always'
+              }
             }
           })
         end
@@ -267,7 +309,7 @@ module Beaker
       end
 
       it 'should start the container' do
-        expect( container ).to receive(:start).with({'PublishAllPorts' => true, 'Privileged' => true})
+        expect( container ).to receive(:start)
 
         docker.provision
       end
@@ -303,6 +345,16 @@ module Beaker
           expect( hosts[0]['ssh'][:forward_agent] ).to be === true
         end
 
+        it 'should connect to gateway ip' do
+          FakeFS do
+            File.open('/.dockerenv', 'w') { }
+            docker.provision
+
+            expect( hosts[0]['ip'] ).to be === '192.0.2.254'
+            expect( hosts[0]['port'] ).to be === 8022
+          end
+        end
+
       end
 
       it "should generate a new /etc/hosts file referencing each host" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-docker
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Rishi Javia, Kevin Imber, Tony Vu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-01 00:00:00.000000000 Z
+date: 2017-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec