Merge pull request #175 from xfournet/pr1

marcuslinke · marcuslinke · commit 63ea2fa5af3e · 2015-03-29T10:13:37.000+02:00
SaveImageCmd API doesn't support X-Registry-Auth header
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,9 +151,7 @@ public PushImageCmd pushImageCmd(Identifier identifier) {
 
         @Override
     public SaveImageCmd saveImageCmd(String name) {
-        return new SaveImageCmdImpl(getDockerCmdExecFactory()
-            .createSaveImageCmdExec(), name).withAuthConfig(dockerClientConfig.effectiveAuthConfig(name));
-        
+        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
@@ -12,7 +12,7 @@
 
 public class SaveImageCmdExec extends AbstrDockerCmdExec<SaveImageCmd, InputStream> implements SaveImageCmd.Exec {
     private static final Logger LOGGER = LoggerFactory
-            .getLogger(PushImageCmdExec.class);
+            .getLogger(SaveImageCmdExec.class);
 
     public SaveImageCmdExec(WebTarget baseResource) {
         super(baseResource);
@@ -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);
 
diff --git a/src/test/java/com/github/dockerjava/core/command/SaveImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/SaveImageCmdImplTest.java
@@ -27,7 +27,7 @@
 @Test(groups = "integration")
 public class SaveImageCmdImplTest extends AbstractDockerClientTest {
     public static final Logger LOG = LoggerFactory
-            .getLogger(PushImageCmdImplTest.class);
+            .getLogger(SaveImageCmdImplTest.class);
 
     String username;
 

Original file line number	Diff line number	Diff line change
`@@ -151,9 +151,7 @@ public PushImageCmd pushImageCmd(Identifier identifier) {`
`151`	`151`
`152`	`152`	`@Override`
`153`	`153`	`public SaveImageCmd saveImageCmd(String name) {`
`154`		`- return new SaveImageCmdImpl(getDockerCmdExecFactory()`
`155`		`- .createSaveImageCmdExec(), name).withAuthConfig(dockerClientConfig.effectiveAuthConfig(name));`
`156`		`-`
	`154`	`+ return new SaveImageCmdImpl(getDockerCmdExecFactory().createSaveImageCmdExec(), name);`
`157`	`155`	`}`
`158`	`156`
`159`	`157`	`@Override`