From 4f969dcff36635b242fdec38a2bb398ea7c68bac Mon Sep 17 00:00:00 2001 From: Roman Timushev Date: Mon, 19 Jan 2015 10:52:11 +0300 Subject: [PATCH] Allow unauthorized pullImageCmd --- .../com/github/dockerjava/core/DockerClientImpl.java | 2 +- .../core/command/AbstrAuthCfgDockerCmd.java | 11 ++++++++++- .../dockerjava/core/command/PullImageCmdImpl.java | 5 +++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java index cee364e00..9581a5b8d 100644 --- a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java +++ b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java @@ -125,7 +125,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 index 72aa94d8f..96e92da4b 100644 --- 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, RES_T> extends AbstrDockerCmd { + public AbstrAuthCfgDockerCmd(DockerCmdExec execution, AuthConfig authConfig) { + super(execution); + withOptionalAuthConfig(authConfig); + } + public AbstrAuthCfgDockerCmd(DockerCmdExec 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 index b2e62434a..bcd3613b4 100644 --- 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