docker-api 1.20.0 → 1.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8561445c82a9399f7fc303f3a0980b9a0435cb0e
-  data.tar.gz: 436d9e686521e49445dc2e6f786998f2dfd81730
+  metadata.gz: c60e727e41589271f61a49d530a0dded82d81448
+  data.tar.gz: da74b0b29b1732a2aaabca6dc0dddca84d628a9e
 SHA512:
-  metadata.gz: b42de620e15d9b503791ef23fc7bdd9598f4541ddff03d7a7b306b6e48ba30ec6c263038e2719c37405e3176ca9fc05042d5a864ded610f1664362bb7051ec62
-  data.tar.gz: f75aec1ebe9c929cca1bac68a0a46e0c474e03b73259c87c7f72ba30ba5e0dbe86f1395a45aa092553a8d50b94d4216b975c7de23ad5c385af8b3e3df87cc5e6
+  metadata.gz: 5dd6e22287a43e0fb91fddd529c371c44e0b2c5de387e10d973be9d71de3b917c887f7e3b9fd20771be6210b4480e2f59f78f9d7f16dc29fb0de053343bc9bf1
+  data.tar.gz: e455ff3b6fda2c4d3eb86d044b0bd9a09705b6bcfa6f969576e0d142a8f8fb39243b4fcc242a522840a773551321feab29308d4bd6c951fe11fbe8c9a2de0a58

data/.cane

@@ -1 +1,2 @@
 --abc-max 16
+--style-measure 100

data/README.md

@@ -44,7 +44,9 @@ $ sudo docker -d
 
 This will daemonize Docker so that it can be used for the remote API calls.
 
-If you're running Docker locally as a socket, there is no setup to do in Ruby. If you're not or change the path of the socket, you'll have to point the gem to your socket or local/remote port. For example:
+### Host
+
+If you're running Docker locally as a socket, there is no setup to do in Ruby. If you're not using a socket or have changed the path of the socket, you'll have to point the gem to your socket or local/remote port. For example:
 
 ```ruby
 Docker.url = 'tcp://example.com:5422'
@@ -76,6 +78,22 @@ irb(main):004:0> Docker.options
 
 Before doing anything else, ensure you have the correct version of the Docker API. To do this, run `Docker.validate_version!`. If your installed version is not supported, a `Docker::Error::VersionError` is raised.
 
+### SSL
+
+When running docker using SSL, setting the DOCKER_CERT_PATH will configure docker-api to use SSL.
+The cert path is a folder that contains the cert, key and cacert files.
+docker-api is expecting the files to be named: cert.pem, key.pem, and ca.pem.
+If your files are named different, you'll want to set your options explicity:
+
+```
+Docker.options = {
+    client_cert: File.join(cert_path, 'cert.pem'),
+    client_key: File.join(cert_path, 'key.pem'),
+    ssl_ca_file: File.join(cert_path, 'ca.pem'),
+    scheme: 'https'
+}
+```
+
 ## Global calls
 
 All of the following examples require a connection to a Docker server. See the <a href="#starting-up">Starting up</a> section above for more information.

data/lib/docker.rb

@@ -46,6 +46,16 @@ module Docker
         client_key: File.join(cert_path, 'key.pem'),
         ssl_ca_file: File.join(cert_path, 'ca.pem'),
         scheme: 'https'
+      }.merge(ssl_options)
+    else
+      {}
+    end
+  end
+
+  def ssl_options
+    if ENV['DOCKER_SSL_VERIFY'] == 'false'
+      {
+        ssl_verify_peer: false
       }
     else
       {}
@@ -121,5 +131,5 @@ module Docker
   module_function :default_socket_url, :env_url, :url, :url=, :env_options,
                   :options, :options=, :creds, :creds=, :logger, :logger=,
                   :connection, :reset!, :reset_connection!, :version, :info,
-                  :authenticate!, :validate_version!
+                  :authenticate!, :validate_version!, :ssl_options
 end

data/lib/docker/version.rb

@@ -1,6 +1,6 @@
 module Docker
   # The version of the docker-api gem.
-  VERSION = '1.20.0'
+  VERSION = '1.21.0'
 
   # The version of the compatible Docker remote API.
   API_VERSION = '1.16'

data/spec/docker_spec.rb

@@ -82,6 +82,7 @@ describe Docker do
           .and_return('tcp://someserver:8103')
         allow(ENV).to receive(:[]).with('DOCKER_CERT_PATH')
           .and_return('/boot2dockert/cert/path')
+        allow(ENV).to receive(:[]).with('DOCKER_SSL_VERIFY').and_return(nil)
         Docker.reset!
       end
 
@@ -96,6 +97,32 @@ describe Docker do
       its(:url) { should == 'tcp://someserver:8103' }
       its(:connection) { should be_a Docker::Connection }
     end
+
+    context "when the DOCKER_CERT_PATH and DOCKER_SSL_VERIFY ENV variables are set" do
+      before do
+        allow(ENV).to receive(:[]).with('DOCKER_URL').and_return(nil)
+        allow(ENV).to receive(:[]).with('DOCKER_HOST')
+          .and_return('tcp://someserver:8103')
+        allow(ENV).to receive(:[]).with('DOCKER_CERT_PATH')
+          .and_return('/boot2dockert/cert/path')
+        allow(ENV).to receive(:[]).with('DOCKER_SSL_VERIFY')
+          .and_return('false')
+        Docker.reset!
+      end
+
+      its(:options) {
+        should == {
+          client_cert: '/boot2dockert/cert/path/cert.pem',
+          client_key: '/boot2dockert/cert/path/key.pem',
+          ssl_ca_file: '/boot2dockert/cert/path/ca.pem',
+          scheme: 'https',
+          ssl_verify_peer: false
+        }
+      }
+      its(:url) { should == 'tcp://someserver:8103' }
+      its(:connection) { should be_a Docker::Connection }
+    end
+
   end
 
   describe '#reset_connection!' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-api
 version: !ruby/object:Gem::Version
-  version: 1.20.0
+  version: 1.21.0
 platform: ruby
 authors:
 - Swipely, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-02 00:00:00.000000000 Z
+date: 2015-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon