beaker-docker 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67087e4a344e2b99b38c11d92dc6e1ec6d0da906
-  data.tar.gz: 590abd5e22e21b77974f7ec68c53580d12a95e92
+  metadata.gz: 6209552fba9be50c92f1ab41f05168aba9496fb1
+  data.tar.gz: 7005bd577927536fd0310fafae5019ec0e1934e1
 SHA512:
-  metadata.gz: 6d7a7cb7428dd46aaf452fd91a84ed1195852ad49976f701d04b36ad740b1e1c0f38fdd3f4d1cc473ef80af3bff8a14cf0f49ac53562d8bbcb0de4527a2c482e
-  data.tar.gz: fd4b769202763ccd5da58cd0620284d481a894fed70e2ac3663b4e6a007885d3c6b7bfa0e388dbb4ab393091d0e25019a4d4058e8c116efe7f46b472d0106b49
+  metadata.gz: 4d8ae66a90bcec770102ec58df4a2ab813e0876af97dce42f296e45b0dc07612830b7d0edb00de1b8d57d734e99b758296603bb01986e494d79fdcd19e4318d6
+  data.tar.gz: bc0a408820e03f065f4723fcae75103abf3fdb305225f247754d591c0538366dd685b007cda74d85d8df321f6c629e2934990ea1850accf89551c6c6d3670e5d

data/acceptance/config/nodes/hosts.yaml

@@ -12,6 +12,10 @@ HOSTS:
       - classifier
       - default
     docker_cmd: '["/sbin/init"]'
+    dockeropts:
+      Labels:
+        one: '1'
+        two: '2'
   ubuntu1604-64-2:
     platform: ubuntu-1604-x86_64
     hypervisor: docker
@@ -23,3 +27,7 @@ CONFIG:
   nfs_server: none
   consoleport: 443
   log_level: verbose
+  dockeropts:
+    Labels:
+      one: '3'
+      two: '4'

data/lib/beaker-docker/version.rb

@@ -1,3 +1,3 @@
 module BeakerDocker
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

data/lib/beaker/hypervisor/docker.rb

@@ -81,6 +81,12 @@ module Beaker
             }
           }
         }
+        if host['dockeropts'] || @options[:dockeropts]
+          dockeropts = host['dockeropts'] ? host['dockeropts'] : @options[:dockeropts]
+          dockeropts.each do |k,v|
+            container_opts[k] = v
+          end
+        end
         container = find_container(host)
 
         # If the specified container exists, then use it rather creating a new one

data/spec/beaker/hypervisor/docker_spec.rb

@@ -20,7 +20,16 @@ module Beaker
   ]
 
   describe Docker do
-    let(:hosts) { make_hosts }
+    let(:hosts) {
+      the_hosts = make_hosts
+      the_hosts[2]['dockeropts'] = {
+        'Labels' => {
+          'one' => 3,
+          'two' => 4,
+        },
+      }
+      the_hosts
+    }
 
     let(:logger) do
       logger = double('logger')
@@ -35,7 +44,13 @@ module Beaker
     let(:options) {{
       :logger => logger,
       :forward_ssh_agent => true,
-      :provision => true
+      :provision => true,
+      :dockeropts => {
+        'Labels' => {
+          'one' => 1,
+          'two' => 2,
+        },
+      },
     }}
 
     let(:image) do
@@ -65,7 +80,7 @@ module Beaker
             ],
           },
           'Gateway' => '192.0.2.254'
-        },
+        }
       })
       allow( container ).to receive(:kill)
       allow( container ).to receive(:delete)
@@ -191,7 +206,11 @@ module Beaker
               'RestartPolicy' => {
                 'Name' => 'always'
               }
-            }
+            },
+            'Labels' => {
+              'one' => 1,
+              'two' => 2,
+            },
           }).with(hash_excluding('name'))
         end
 
@@ -220,7 +239,11 @@ module Beaker
               'RestartPolicy' => {
                 'Name' => 'always'
               }
-            }
+            },
+            'Labels' => {
+              'one' => 1,
+              'two' => 2,
+            },
           }).with(hash_excluding('name'))
         end
 
@@ -245,7 +268,11 @@ module Beaker
               'RestartPolicy' => {
                 'Name' => 'always'
               }
-            }
+            },
+            'Labels' => {
+              'one' => (index == 2 ? 3 : 1),
+              'two' => (index == 2 ? 4 : 2),
+            },
           })
         end
 
@@ -299,7 +326,11 @@ module Beaker
               'RestartPolicy' => {
                 'Name' => 'always'
               }
-            }
+            },
+            'Labels' => {
+              'one' => (index == 2 ? 3 : 1),
+              'two' => (index == 2 ? 4 : 2),
+            },
           })
         end
 
@@ -323,7 +354,11 @@ module Beaker
                 'Name' => 'always'
               },
               'CapAdd' => ['NET_ADMIN', 'SYS_ADMIN']
-            }
+            },
+            'Labels' => {
+              'one' => (index == 2 ? 3 : 1),
+              'two' => (index == 2 ? 4 : 2),
+            },
           })
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-docker
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Rishi Javia, Kevin Imber, Tony Vu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-09 00:00:00.000000000 Z
+date: 2018-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec