docker-api 1.33.4 → 1.33.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc4cc0582b0d1790debfb8be47bb928f5c1a92c8
-  data.tar.gz: ec329aa7f8fcbdf7991faa44ca5a54cb962d8dc0
+  metadata.gz: feaf132a5bd3b3aa9bd58bd2f0741135cedc676f
+  data.tar.gz: 4298604d6b131a80e6d2be772c7730b474a415d2
 SHA512:
-  metadata.gz: 707a35dfc34923c91c0f41971c1932749b932396a8a3f8b345630754a07113faa23be27a8af5b4838c4ed6b8f783e24e49d1e416fbfb9a98734f9ee9a246f7e1
-  data.tar.gz: c40703a85329908dc1ca5654fc4e59af856db02504e6b50029f2170f4e465d6d39984aee1b417abfe0c36145578ab2df9263b3b6c6362b4ea4fdb499e7d39a60
+  metadata.gz: b5959dd544f98292d00b4c81ecc18292f1f152a12840109b56bdbb948bba7c1ad9755120822c8edd1ae680f9699bdc7946c8fd09e59749982c419bff71433e81
+  data.tar.gz: 82e462599091c8234f832ad5fa7d7739b7826161a05784862e756d2a512686f7466e199c2a2c6888c60ff0dde17aea55b5478475d41b646e482f8a90e231a02a

data/README.md

@@ -130,6 +130,10 @@ Docker.info
 # docker command for reference: docker login
 Docker.authenticate!('username' => 'docker-fan-boi', 'password' => 'i<3docker', 'email' => 'dockerboy22@aol.com')
 # => true
+
+# docker command for reference: docker login registry.gitlab.com
+Docker.authenticate!('username' => 'docker-fan-boi', 'password' => 'i<3docker', 'email' => 'dockerboy22@aol.com', 'serveraddress' => 'https://registry.gitlab.com/v1/')
+# => true
 ```
 
 ## Images

data/lib/docker/image.rb

@@ -12,11 +12,11 @@ class Docker::Image
     begin
       Docker::Container.create(opts, connection)
                        .tap(&:start!)
-    rescue ServerError => ex
+    rescue ServerError, ClientError => ex
       if cmd
         raise ex
       else
-        raise ServerError, "No command specified."
+        raise ex, "No command specified."
       end
     end
   end
@@ -117,7 +117,10 @@ class Docker::Image
         :headers => headers,
         :response_block => response_block(body, &block)
         )
+      # NOTE: see associated tests for why we're looking at image#end_with?
       image = opts['fromImage'] || opts[:fromImage]
+      tag = opts['tag'] || opts[:tag]
+      image = "#{image}:#{tag}" if tag && !image.end_with?(":#{tag}")
       get(image, {}, conn)
     end
 

data/lib/docker/util.rb

@@ -233,7 +233,7 @@ module Docker::Util
 
   def build_auth_header(credentials)
     credentials = credentials.to_json if credentials.is_a?(Hash)
-    encoded_creds = Base64.encode64(credentials).gsub(/\n/, '')
+    encoded_creds = Base64.urlsafe_encode64(credentials)
     {
       'X-Registry-Auth' => encoded_creds
     }
@@ -251,7 +251,7 @@ module Docker::Util
       }
     }.to_json
 
-    encoded_header = Base64.encode64(header).gsub(/\n/, '')
+    encoded_header = Base64.urlsafe_encode64(header)
 
     {
       'X-Registry-Config' => encoded_header

data/lib/docker/version.rb

@@ -1,6 +1,6 @@
 module Docker
   # The version of the docker-api gem.
-  VERSION = '1.33.4'
+  VERSION = '1.33.5'
 
   # 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.4
+  version: 1.33.5
 platform: ruby
 authors:
 - Swipely, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-10 00:00:00.000000000 Z
+date: 2017-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon