docker-api 1.33.1 → 1.33.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f2153bd93ec648db56caaeb9a8ada00429e98c8
-  data.tar.gz: 91c4a6e57f4cc4210159c89036873c7efab34a42
+  metadata.gz: c7f6210b17acce594077095ab5b4a79d159c306d
+  data.tar.gz: 976dfd70143edcac266a86b683e6d912febef0f7
 SHA512:
-  metadata.gz: d9448d1557db51e7327e18aafb69649093fd83d79f18b1e661ea5f04c33fdf0e804f7a1f034cd7e72bfe9fb741866c275eb7e1bb2ac43b275c711dae8fb0de8d
-  data.tar.gz: 54f487380c6c2136ca463de9efeddb610e0cb35a0487b618c598de4942f6c35274a05457c4939eef1170aa07785b34ab7a10d5cc7ad455b2b90ddaca10aa9104
+  metadata.gz: b34dc7548ae9c5f2deb3bc9015362ba9ba7494c24642e9592b1885b5cee35b1e61b3aa4f3ee49a5d4654f6bd760e42c87280df9f57d4c6c7bafa986bbe0ca9ec
+  data.tar.gz: be341758585b6b54698c856932f299fbd9c04a497d2eeac27e8f4ae738678c8d790956848b0d440ac0ac79efde392ab22734917b4e21fd691799d6ffd92f997e

data/README.md

@@ -94,6 +94,21 @@ Docker.options = {
 }
 ```
 
+If you want to load the cert files from a variable, e.g. you want to load them from ENV as needed on Heroku:
+
+```
+cert_store = OpenSSL::X509::Store.new
+certificate = OpenSSL::X509::Certificate.new ENV["DOCKER_CA"]
+cert_store.add_cert certificate
+
+Docker.options = {
+  client_cert_data: ENV["DOCKER_CERT"],
+  client_key_data: ENV["DOCKER_KEY"],
+  ssl_cert_store: cert_store,
+  scheme: 'https'
+}
+```
+
 If you need to disable SSL verification, set the DOCKER_SSL_VERIFY variable to 'false'.
 
 ## Global calls

data/lib/docker.rb

@@ -134,6 +134,8 @@ module Docker
   def validate_version!
     Docker.info
     true
+  rescue Docker::Error::TimeoutError
+    raise
   rescue Docker::Error::DockerError
     raise Docker::Error::VersionError, "Expected API Version: #{API_VERSION}"
   end

data/lib/docker/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-api
 version: !ruby/object:Gem::Version
-  version: 1.33.1
+  version: 1.33.2
 platform: ruby
 authors:
 - Swipely, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-19 00:00:00.000000000 Z
+date: 2017-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon