beaker-docker 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1f70940dc7c4b43db06838e143fc4e4a498247be0ed67ae0926ae84527f5786
-  data.tar.gz: b12830fb23b10ccf1718be061c3e6ffe3e81c0b47b3aff58e3882e2e0a843c7d
+  metadata.gz: 02eaf00011bdb77e04d6c2ba218c0d6cb2f0337f03ea9e8770bbc132e8532d78
+  data.tar.gz: 1df91fb159aca545ae67ece3c5b4dfc326a81ef5ee8ce307acf21ab16fa4459f
 SHA512:
-  metadata.gz: d182e05ba8dea02f896571bb5cf100f3a313349e1178f3eb9daf5e62f7ec93572114e4e1cf6e10a34aa18e8280d7be0ff7ed8a1482984cbd07ae3a530a7a0be9
-  data.tar.gz: 478ac68e7088d66a8f5a4732f59a1337b355293b5a5f8d38551e5d54b81e6e7634528139b4c5717462b3d0b4a8558de05afc83b2f2c51705f0e8d16b7fb885a8
+  metadata.gz: 312bf63f3ea66c8d75921c4314912b6451b2457e31452b5cf05b2edbd43c671cefc9c0157f89ea01fb1ed8bcd49769be5770c0c18c559f6ccc47df39620e7e60
+  data.tar.gz: e087e4e649f2e31db3425ffefa0c83532e89ae4b8c6d7fab090989a511ced8b3f71133d9e211ae15358312ff0106c82ebd050245feb3e9743fe6caa60aafda02

data/lib/beaker-docker/version.rb

@@ -1,3 +1,3 @@
 module BeakerDocker
-  VERSION = '0.8.1'
+  VERSION = '0.8.2'
 end

data/lib/beaker/hypervisor/docker.rb

@@ -192,6 +192,8 @@ module Beaker
           image_name = image.id
         end
 
+        ### BEGIN CONTAINER OPTIONS MANGLING ###
+
         container_opts = get_container_opts(host, image_name)
         if host['dockeropts'] || @options[:dockeropts]
           dockeropts = host['dockeropts'] ? host['dockeropts'] : @options[:dockeropts]
@@ -228,8 +230,17 @@ module Beaker
             container_opts['Env'] = host['docker_env']
           end
 
+          # Fixup privileges
+          #
+          # If the user has specified CAPs, then we cannot be privileged
+          #
+          # If the user has not specified CAPs, we will default to privileged for
+          # compatibility with worst practice
           if host['docker_cap_add']
             container_opts['HostConfig']['CapAdd'] = host['docker_cap_add']
+            container_opts['HostConfig'].delete('Privileged')
+          else
+            container_opts['HostConfig']['Privileged'] = container_opts['HostConfig']['Privileged'].nil? ? true : container_opts['HostConfig']['Privileged']
           end
 
           if host['docker_container_name']
@@ -238,6 +249,8 @@ module Beaker
             container_opts['name'] = ['beaker', host.name, SecureRandom.uuid.split('-').last].join('-')
           end
 
+          ### END CONTAINER OPTIONS MANGLING ###
+
           @logger.debug("Creating container from image #{image_name}")
 
           ok=false

data/spec/beaker/hypervisor/docker_spec.rb

@@ -303,6 +303,7 @@ module Beaker
                 'PortBindings' => {
                   '22/tcp' => [{ 'HostPort' => /\b\d{4}\b/, 'HostIp' => '0.0.0.0'}]
                 },
+                'Privileged' => true,
                 'PublishAllPorts' => true,
                 'RestartPolicy' => {
                   'Name' => 'always'
@@ -337,6 +338,7 @@ module Beaker
                   '22/tcp' => [{ 'HostPort' => /\b\d{4}\b/, 'HostIp' => '0.0.0.0'}]
                 },
                 'PublishAllPorts' => true,
+                'Privileged' => true,
                 'RestartPolicy' => {
                   'Name' => 'always'
                 }
@@ -367,6 +369,7 @@ module Beaker
                   '22/tcp' => [{ 'HostPort' => /\b\d{4}\b/, 'HostIp' => '0.0.0.0'}]
                 },
                 'PublishAllPorts' => true,
+                'Privileged' => true,
                 'RestartPolicy' => {
                   'Name' => 'always'
                 }
@@ -424,6 +427,7 @@ module Beaker
                   '22/tcp' => [{ 'HostPort' => /\b\d{4}\b/, 'HostIp' => '0.0.0.0'}]
                 },
                 'PublishAllPorts' => true,
+                'Privileged' => true,
                 'RestartPolicy' => {
                   'Name' => 'always'
                 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-docker
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Rishi Javia, Kevin Imber, Tony Vu