Send appropriate headers

lib/docker/image.rb

@@ -192,15 +192,15 @@ def build_from_dir(dir, opts = {}, connection = Docker.connection,
 
   private
 
-  # A method to build auth headers and merge them into headers sent
-  # by build_from_dir.
+  # A method to build the config header and merge it into the
+  # headers sent by build_from_dir.
   def self.build_headers(creds)
     credentials = creds || Docker.creds || {}
-    auth_header = Docker::Util.build_auth_header(credentials.to_json)
+    config_header = Docker::Util.build_config_header(credentials)
 
     headers = { 'Content-Type'      => 'application/tar',
                 'Transfer-Encoding' => 'chunked' }
-    headers = headers.merge(auth_header) if auth_header
+    headers = headers.merge(config_header) if config_header
     headers
   end
 

lib/docker/util.rb

@@ -77,8 +77,28 @@ def build_auth_header(credentials)
     credentials = credentials.to_json if credentials.is_a?(Hash)
     encoded_creds = Base64.encode64(credentials).gsub(/\n/, '')
     {
-      'X-Registry-Auth' => encoded_creds,
-      'X-Registry-Config' => encoded_creds,
+      'X-Registry-Auth' => encoded_creds
+    }
+  end
+
+  def build_config_header(credentials)
+    if credentials.is_a?(String)
+      credentials = JSON.parse(credentials, symbolize_names: true)
+    end
+    header = {
+      "configs" => {
+        credentials[:serveraddress].to_s => {
+          "username" => credentials[:username].to_s,
+          "password" => credentials[:password].to_s,
+          "email" => credentials[:email].to_s
+        }
+      }
+    }.to_json
+
+    encoded_header = Base64.encode64(header).gsub(/\n/, '')
+
+    {
+      'X-Registry-Config' => encoded_header
     }
   end
 end

spec/docker/image_spec.rb

@@ -455,14 +455,15 @@
           {
             :username => 'nahiluhmot',
             :password => '*********',
-            :email => '[email protected]'
+            :email => '[email protected]',
+            :serveraddress => 'https://index.docker.io/v1'
           }
         }
 
         before { Docker.creds = creds }
 
-        it 'sends Docker.creds', :vcr do
-          expect(image.info[:headers].keys).to include('X-Registry-Auth')
+        it 'sends X-Registry-Config header', :vcr do
+          expect(image.info[:headers].keys).to include('X-Registry-Config')
         end
       end
     end

spec/docker/util_spec.rb

@@ -86,25 +86,70 @@
     }
     let(:credential_string) { credentials.to_json }
     let(:encoded_creds) { Base64.encode64(credential_string).gsub(/\n/, '') }
-    let(:expected_headers) {
+    let(:expected_header) {
       {
-        'X-Registry-Auth' => encoded_creds,
-        'X-Registry-Config' => encoded_creds
+        'X-Registry-Auth' => encoded_creds
       }
     }
 
 
     context 'given credentials as a Hash' do
       it 'returns an X-Registry-Auth header encoded' do
-        expect(subject.build_auth_header(credentials)).to eq(expected_headers)
+        expect(subject.build_auth_header(credentials)).to eq(expected_header)
       end
     end
 
     context 'given credentials as a String' do
       it 'returns an X-Registry-Auth header encoded' do
         expect(
           subject.build_auth_header(credential_string)
-        ).to eq(expected_headers)
+        ).to eq(expected_header)
+      end
+    end
+  end
+
+  describe '.build_config_header' do
+    subject { described_class }
+
+    let(:credentials) {
+      {
+        :username      => 'test',
+        :password      => 'password',
+        :email         => '[email protected]',
+        :serveraddress => 'https://registry.com/'
+      }
+    }
+
+    let(:credentials_object) {
+      {
+        :configs => {
+          :'https://registry.com/' => {
+            :username => 'test',
+            :password => 'password',
+            :email    => '[email protected]',
+          }
+        }
+      }.to_json
+    }
+
+    let(:encoded_creds) { Base64.encode64(credentials_object).gsub(/\n/, '') }
+    let(:expected_header) {
+      {
+        'X-Registry-Config' => encoded_creds
+      }
+    }
+
+    context 'given credentials as a Hash' do
+      it 'returns an X-Registry-Config header encoded' do
+        expect(subject.build_config_header(credentials)).to eq(expected_header)
+      end
+    end
+
+    context 'given credentials as a String' do
+      it 'returns an X-Registry-Config header encoded' do
+        expect(
+          subject.build_config_header(credentials.to_json)
+        ).to eq(expected_header)
       end
     end
   end