kitchen-docker 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd9262b64fc818c54e30e2421c81b662a1189e45
-  data.tar.gz: 7a59d117ce6c46cfacc5ddfe0cdda070e8eac679
+  metadata.gz: febbd5bd9280ef03712f80892cb79077b144b495
+  data.tar.gz: 01d4a5cbe7630cffb5bd15b3a8e37ccec6aa650e
 SHA512:
-  metadata.gz: b36a3b35e69914ac13dab5aa52d3de9bc213e4a5b56482dd01672bcb91f14cc6dbdb85af455aa525ea06cfac2a78726ef27460a8657fdd837a1270245be1e2a7
-  data.tar.gz: 90516dd7f44e0e1341a27b378152dd17e5842b137fd69013820a85d3313b5769413705412cc72678412d60a991db50bf52e0ab5182661ae57268c97af64fee73
+  metadata.gz: 5c4927c29863e4d807e7d8d4d8428aef455466713f1d6c1d16d3c94a9fd258e1c0b301227e2d7b96a7225c4670d690b91efa4987ae9fb3f4b3e70606b9c3921c
+  data.tar.gz: 094f03312bba898e5ad6733f2f1e041c883eb64eb299f6e93d59976d6171e5874ccc035489ee05d6a19a1f50cb86ffe9f6f8e689e8ea078d6fa19033ac13b905

data/LICENSE

@@ -1,6 +1,6 @@
 Author:: Sean Porter (<portertech@gmail.com>)
 
-Copyright (C) 2013, Sean Porter
+Copyright (C) 2014, Sean Porter
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/README.md

@@ -226,7 +226,24 @@ Examples:
   - 8.8.8.8
   - 8.8.4.4
 ```
+### http\_proxy
 
+Sets an http proxy for the suite container using the `http_proxy` environment variable. 
+
+Examples:
+
+```
+  http_proxy: http://proxy.host.com:8080
+```
+### https\_proxy
+
+Sets an https proxy for the suite container using the `https_proxy` environment variable.
+
+Examples:
+
+```
+  https_proxy: http://proxy.host.com:8080
+```
 ### forward
 
 Set suite container port(s) to forward to the host machine. You may specify

data/lib/kitchen/driver/docker.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 #
-# Copyright (C) 2013, Sean Porter
+# Copyright (C) 2014, Sean Porter
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@ module Kitchen
       default_config :privileged,    false
       default_config :use_cache,     true
       default_config :remove_images, false
-      default_config :run_command,   '/usr/sbin/sshd -D -o UseDNS=no -o UsePAM=no'
+      default_config :run_command,   '/usr/sbin/sshd -D -o UseDNS=no -o UsePAM=no -o UsePrivilegeSeparation=no -o PidFile=/tmp/sshd.pid'
       default_config :username,      'kitchen'
       default_config :password,      'kitchen'
       default_config :tls,           false
@@ -143,7 +143,6 @@ module Kitchen
         username = config[:username]
         password = config[:password]
         base = <<-eos
-          RUN mkdir -p /var/run/sshd
           RUN useradd -d /home/#{username} -m -s /bin/bash #{username}
           RUN echo #{username}:#{password} | chpasswd
           RUN echo '#{username} ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
@@ -196,10 +195,13 @@ module Kitchen
         Array(config[:forward]).each {|port| cmd << " -p #{port}"}
         Array(config[:dns]).each {|dns| cmd << " -dns #{dns}"}
         Array(config[:volume]).each {|volume| cmd << " -v #{volume}"}
+        Array(config[:volumes_from]).each {|container| cmd << " --volumes-from #{container}"}
         cmd << " -h #{config[:hostname]}" if config[:hostname]
         cmd << " -m #{config[:memory]}" if config[:memory]
         cmd << " -c #{config[:cpu]}" if config[:cpu]
         cmd << " -privileged" if config[:privileged]
+        cmd << " -e http_proxy=#{config[:http_proxy]}" if config[:http_proxy]
+        cmd << " -e https_proxy=#{config[:https_proxy]}" if config[:https_proxy]
         cmd << " #{image_id} #{config[:run_command]}"
         cmd
       end
@@ -222,7 +224,7 @@ module Kitchen
       def parse_container_ssh_port(output)
         begin
           info = Array(::JSON.parse(output)).first
-          ports = info['NetworkSettings']['Ports']
+          ports = info['NetworkSettings']['Ports'] || info['HostConfig']['PortBindings']
           ssh_port = ports['22/tcp'].detect {|port| port['HostIp'] == '0.0.0.0'}
           ssh_port['HostPort'].to_i
         rescue

data/lib/kitchen/driver/docker/erb.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 #
-# Copyright (C) 2013, Sean Porter
+# Copyright (C) 2014, Sean Porter
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/kitchen/driver/docker_version.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 #
-# Copyright (C) 2013, Sean Porter
+# Copyright (C) 2014, Sean Porter
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,6 +19,6 @@ module Kitchen
   module Driver
 
     # Version string for Docker Kitchen driver
-    DOCKER_VERSION = "1.3.1"
+    DOCKER_VERSION = "1.4.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-docker
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-05 00:00:00.000000000 Z
+date: 2014-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen