docker-armada 2.9.0 → 2.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 403ae99285b97c3c3032440db767628a8fa2876e
-  data.tar.gz: bc5a27e415ae56faa4ef5885c92ddb1ae852ad7d
+  metadata.gz: 3736e08a4a96d2d25595cc4ea868846c3b24f396
+  data.tar.gz: f9e925d2fb2a4a7cfa357e2621d5fae915966231
 SHA512:
-  metadata.gz: a7710d1c50edcd5b06ee5c199c343a8a4196eedbe0257e3fab7e892a201379733fe15c7debef106019706dd8ded6cf3bbd3911bed8265a28f23ec6e5415c65f3
-  data.tar.gz: b5407fdabb2fe90a90fbdbf0e803186bb64e357de021fb1a5fb098ad5fbf32d54fe87c7155805170e5e8cfb0fa4cb52b68909932fd895670a77845fb1cd705c4
+  metadata.gz: a8a188a837b9b39b6ff9330486ee0603e355f6c8e221a49cb87a7b62cbe5e6e2e9a70546e9e29de2c1ae892f26a9ff715a7d1b0f5845aaf14f408a7788422137
+  data.tar.gz: eb4a628a1d631aa4276d6e44f5ce82ffbb09e05c4bf53f1062146880c21f55adc62275aff5e7407e331fa68b4e146efd8b0f18b7d0a53e871a95a76c472f121d

data/lib/armada/connection/docker.rb

@@ -24,12 +24,11 @@ module Armada
 
       def connection_opts
         opts = {}
-
         if cert_path = ENV['DOCKER_CERT_PATH']
           opts[:client_cert] = File.join(cert_path, 'cert.pem')
           opts[:client_key] = File.join(cert_path, 'key.pem')
           opts[:ssl_ca_file] = File.join(cert_path, 'ca.pem')
-          opts[:ssl_verify_peer] = false if @gateway
+          opts[:ssl_verify_peer] = @gateway ? false : ENV['DOCKER_TLS_VERIFY'] == '1'
         end
 
         opts

data/spec/connection/docker_spec.rb

@@ -19,6 +19,9 @@ describe Armada::Connection::Docker do
     end
   end
 
+  context 'when docker tls verify is set' do
+  end
+
   context 'when certificate path is set' do
     before(:each) { ENV['DOCKER_CERT_PATH'] = '/some/cert/path' }
 
@@ -31,8 +34,24 @@ describe Armada::Connection::Docker do
     context 'connection options' do
       subject { connection.options }
 
-      it { should include(:client_cert, :client_key, :ssl_ca_file) }
-      it { should_not include(:ssl_verify_peer) }
+      it { should include(:client_cert, :client_key, :ssl_ca_file, :ssl_verify_peer) }
+      its([:ssl_verify_peer]) { should be_false }
+    end
+
+    context 'disable TLS verify' do
+      before(:each) { ENV['DOCKER_TLS_VERIFY'] = '0'}
+      subject { connection.options }
+
+      it { should include(:client_cert, :client_key, :ssl_ca_file, :ssl_verify_peer) }
+      its([:ssl_verify_peer]) { should be_false }
+    end
+
+    context 'enable TLS verify' do
+      before(:each) { ENV['DOCKER_TLS_VERIFY'] = '1'}
+      subject { connection.options }
+
+      it { should include(:client_cert, :client_key, :ssl_ca_file, :ssl_verify_peer) }
+      its([:ssl_verify_peer]) { should be_true }
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker-armada
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.9.1
 platform: ruby
 authors:
 - Jonathan Chauncey
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-19 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon