Merge pull request #128 from rtimush/unauthorized-pull

marcuslinke · marcuslinke · commit 7e50459c1475 · 2015-01-21T23:18:30.000+01:00
Allow unauthorized pullImageCmd
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -122,7 +122,7 @@ public VersionCmd versionCmd() {
 	@Override
 	public PullImageCmd pullImageCmd(String repository) {
 		return new PullImageCmdImpl(getDockerCmdExecFactory()
-				.createPullImageCmdExec(), repository).withAuthConfig(dockerClientConfig.effectiveAuthConfig(repository));
+				.createPullImageCmdExec(), dockerClientConfig.effectiveAuthConfig(repository), repository);
 	}
 
 	@Override
diff --git a/src/main/java/com/github/dockerjava/core/command/AbstrAuthCfgDockerCmd.java b/src/main/java/com/github/dockerjava/core/command/AbstrAuthCfgDockerCmd.java
@@ -15,6 +15,11 @@
 public abstract class AbstrAuthCfgDockerCmd<T extends DockerCmd<RES_T>, RES_T> extends
 		AbstrDockerCmd<T, RES_T> {
 
+	public AbstrAuthCfgDockerCmd(DockerCmdExec<T, RES_T> execution, AuthConfig authConfig) {
+		super(execution);
+		withOptionalAuthConfig(authConfig);
+	}
+
 	public AbstrAuthCfgDockerCmd(DockerCmdExec<T, RES_T> execution) {
 		super(execution);
 	}
@@ -25,9 +30,13 @@ public AuthConfig getAuthConfig() {
 		return authConfig;
 	}
 
-	@SuppressWarnings("unchecked")
 	public T withAuthConfig(AuthConfig authConfig) {
 		Preconditions.checkNotNull(authConfig, "authConfig was not specified");
+		return withOptionalAuthConfig(authConfig);
+	}
+
+	@SuppressWarnings("unchecked")
+	private T withOptionalAuthConfig(AuthConfig authConfig) {
 		this.authConfig = authConfig;
 		return (T)this;
 	}
diff --git a/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.core.command;
 
 import com.github.dockerjava.api.command.PullImageCmd;
+import com.github.dockerjava.api.model.AuthConfig;
 import com.google.common.base.Preconditions;
 
 import java.io.InputStream;
@@ -14,8 +15,8 @@ public class PullImageCmdImpl extends AbstrAuthCfgDockerCmd<PullImageCmd, InputS
 
     private String repository, tag, registry;
 
-	public PullImageCmdImpl(PullImageCmd.Exec exec, String repository) {
-		super(exec);
+	public PullImageCmdImpl(PullImageCmd.Exec exec, AuthConfig authConfig, String repository) {
+		super(exec, authConfig);
 		withRepository(repository);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ public VersionCmd versionCmd() {`
`122`	`122`	`@Override`
`123`	`123`	`public PullImageCmd pullImageCmd(String repository) {`
`124`	`124`	`return new PullImageCmdImpl(getDockerCmdExecFactory()`
`125`		`- .createPullImageCmdExec(), repository).withAuthConfig(dockerClientConfig.effectiveAuthConfig(repository));`
	`125`	`+ .createPullImageCmdExec(), dockerClientConfig.effectiveAuthConfig(repository), repository);`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`@Override`