SaveImageCmd API doesn't support X-Registry-Auth header

xfournet · xfournet · commit fc3f7b750ea9 · 2015-03-19T11:47:11.000+01:00
diff --git a/src/main/java/com/github/dockerjava/api/command/SaveImageCmd.java b/src/main/java/com/github/dockerjava/api/command/SaveImageCmd.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.command;
 
 import com.github.dockerjava.api.NotFoundException;
-import com.github.dockerjava.api.model.AuthConfig;
 
 import java.io.InputStream;
 
@@ -21,10 +20,6 @@ public interface SaveImageCmd extends DockerCmd<InputStream>{
      */
     public SaveImageCmd withTag(String tag);
 
-    public AuthConfig getAuthConfig();
-
-    public SaveImageCmd withAuthConfig(AuthConfig authConfig);
-
     /**
      * @throws com.github.dockerjava.api.NotFoundException No such image
      */
@@ -34,4 +29,4 @@ public static interface Exec extends DockerCmdExec<SaveImageCmd, InputStream> {
     }
 
 
-}
+}
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -151,13 +151,7 @@ public PushImageCmd pushImageCmd(Identifier identifier) {
 
         @Override
     public SaveImageCmd saveImageCmd(String name) {
-        SaveImageCmdImpl cmd = new SaveImageCmdImpl(getDockerCmdExecFactory().createSaveImageCmdExec(), name);
-
-        AuthConfig cfg = dockerClientConfig.effectiveAuthConfig(name);
-        if (cfg != null)
-            cmd.withAuthConfig(cfg);
-
-        return cmd;
+        return new SaveImageCmdImpl(getDockerCmdExecFactory().createSaveImageCmdExec(), name);
     }
 
 	@Override
diff --git a/src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java
@@ -7,7 +7,7 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-public class SaveImageCmdImpl extends AbstrAuthCfgDockerCmd<SaveImageCmd, InputStream> implements SaveImageCmd {
+public class SaveImageCmdImpl extends AbstrDockerCmd<SaveImageCmd, InputStream> implements SaveImageCmd {
     private String name;
     private String tag;
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java
@@ -23,11 +23,9 @@ protected InputStream execute(SaveImageCmd command) {
         WebTarget webResource = getBaseResource().path("/images/" + command.getName() + "/get")
                 .queryParam("tag", command.getTag());
 
-        final String registryAuth = registryAuth(command.getAuthConfig());
         LOGGER.trace("GET: {}", webResource);
         InputStream is =  webResource
                 .request()
-                .header("X-Registry-Auth", registryAuth)
                 .accept(MediaType.APPLICATION_JSON)
                 .get().readEntity(InputStream.class);
 
