docker-armada 2.8.0 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c741d480da83fb371c6f20ea0ecd11d8170cd969
-  data.tar.gz: 247cc72cdc17beee8a1147d4f836e3a217535017
+  metadata.gz: 403ae99285b97c3c3032440db767628a8fa2876e
+  data.tar.gz: bc5a27e415ae56faa4ef5885c92ddb1ae852ad7d
 SHA512:
-  metadata.gz: 3f349c33d13bed42612fbd76b1d60e747eba2665e6c22165ebfb183f87f21629f4028d93e6b7774994413c23f1f5b006b7bbf2b9400e00e7453ab391bb90505c
-  data.tar.gz: cdcef98da8616d11f0b8b604c8d2234550fea29ce147359318fb6331ad0b0014bc9257399ad0c9fa6644d036b6652b1abad0db3f25e79f5078948263e3500c76
+  metadata.gz: a7710d1c50edcd5b06ee5c199c343a8a4196eedbe0257e3fab7e892a201379733fe15c7debef106019706dd8ded6cf3bbd3911bed8265a28f23ec6e5415c65f3
+  data.tar.gz: b5407fdabb2fe90a90fbdbf0e803186bb64e357de021fb1a5fb098ad5fbf32d54fe87c7155805170e5e8cfb0fa4cb52b68909932fd895670a77845fb1cd705c4

data/README.md

@@ -295,6 +295,13 @@ Examples:
 armada clean images --hosts my-docker-host-01:3435
 ```
 
+## TLS Support
+If the DOCKER_CERT_PATH environment variable is set then the proper cert options will be set for the client.  Make sure you have the following files in the DOCKER_CERT_PATH location:
+* `cert.pem`
+* `key.pem`
+* `ca.pem`
+
+
 ## Maintainers
 [Jonathan Chauncey (jchauncey)](https://github.com/jchauncey)  
 [Darrell Hamilton (zeroem)](https://github.com/zeroem)

data/lib/armada/connection/docker.rb

@@ -14,8 +14,25 @@ module Armada
 
       private
       def create_connection
-        return ::Docker::Connection.new("http://localhost:#{@tunneled_port}", {}) if @gateway
-        return ::Docker::Connection.new("http://#{@host}:#{@port}", {})
+        return ::Docker::Connection.new("#{scheme}://localhost:#{@tunneled_port}", connection_opts) if @gateway
+        return ::Docker::Connection.new("#{scheme}://#{@host}:#{@port}", connection_opts)
+      end
+
+      def scheme
+        ENV['DOCKER_CERT_PATH'] ? 'https' : 'http'
+      end
+
+      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
+        end
+
+        opts
       end
     end
   end

data/spec/connection/docker_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe Armada::Connection::Docker do
+  let(:connection) { described_class.new('localhost:1234').connection }
+
+  context 'when no certificate path is set' do
+    before(:each) { ENV['DOCKER_CERT_PATH'] = nil }
+
+    context 'scheme' do
+      subject { connection.url }
+
+      it { should start_with 'http://' }
+    end
+
+    context 'connection options' do
+      subject { connection.options }
+
+      it { should_not include(:client_cert, :client_key, :ssl_ca_file, :ssl_verify_peer) }
+    end
+  end
+
+  context 'when certificate path is set' do
+    before(:each) { ENV['DOCKER_CERT_PATH'] = '/some/cert/path' }
+
+    context 'scheme' do
+      subject { connection.url }
+
+      it { should start_with 'https://' }
+    end
+
+    context 'connection options' do
+      subject { connection.options }
+
+      it { should include(:client_cert, :client_key, :ssl_ca_file) }
+      it { should_not include(:ssl_verify_peer) }
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker-armada
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.9.0
 platform: ruby
 authors:
 - Jonathan Chauncey
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-13 00:00:00.000000000 Z
+date: 2015-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -253,6 +253,7 @@ files:
 - lib/armada/utils/commands.rb
 - lib/armada/utils/time.rb
 - lib/armada/version.rb
+- spec/connection/docker_spec.rb
 - spec/connection/health_check_spec.rb
 - spec/deploy_dsl_spec.rb
 - spec/docker/container_spec.rb
@@ -283,6 +284,7 @@ signing_key:
 specification_version: 4
 summary: Deploy utility for docker containers
 test_files:
+- spec/connection/docker_spec.rb
 - spec/connection/health_check_spec.rb
 - spec/deploy_dsl_spec.rb
 - spec/docker/container_spec.rb