Skip to content

Added support to use the credentials from .dockercfg during build #204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcuslinke merged 1 commit into from
May 1, 2015
Merged

Added support to use the credentials from .dockercfg during build #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/main/java/com/github/dockerjava/core/AuthConfigFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import java.util.List;
import java.util.Map;

import com.github.dockerjava.api.model.AuthConfigurations;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.StringUtils;
Expand Down Expand Up @@ -50,6 +51,15 @@ public AuthConfig resolveAuthConfig(String hostname) {
return null;
}

public AuthConfigurations getAuthConfigurations() {
final AuthConfigurations authConfigurations = new AuthConfigurations();
for(Map.Entry<String, AuthConfig> authConfigEntry : authConfigMap.entrySet()) {
authConfigurations.addConfig(authConfigEntry.getValue());
}

return authConfigurations;
}

@Override
public int hashCode() {
final int prime = 31;
Expand Down
19 changes: 19 additions & 0 deletions src/main/java/com/github/dockerjava/core/DockerClientConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

import com.github.dockerjava.api.DockerClientException;
import com.github.dockerjava.api.model.AuthConfig;
import com.github.dockerjava.api.model.AuthConfigurations;
import com.github.dockerjava.core.NameParser.HostnameReposName;
import com.github.dockerjava.core.NameParser.ReposTag;

Expand Down Expand Up @@ -310,6 +311,24 @@ public AuthConfig effectiveAuthConfig(String imageName) {
return authConfig;
}

public AuthConfigurations getAuthConfigurations() {
String dockerCfgFile = getDockerCfgPath();
if (dockerCfgFile != null) {
AuthConfigFile authConfigFile;
try {
authConfigFile = AuthConfigFile.loadConfig(new File(
dockerCfgFile));
} catch (IOException e) {
throw new DockerClientException(
"Failed to parse dockerCfgFile", e);
}

return authConfigFile.getAuthConfigurations();
}

return new AuthConfigurations();
}

@Override
public boolean equals(Object o) {
if (this == o) return true;
Expand Down
28 changes: 19 additions & 9 deletions src/main/java/com/github/dockerjava/core/DockerClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@
import com.github.dockerjava.api.DockerClient;
import com.github.dockerjava.api.command.*;
import com.github.dockerjava.api.model.AuthConfig;
import com.github.dockerjava.api.model.AuthConfigurations;
import com.github.dockerjava.api.model.Identifier;
import com.github.dockerjava.core.command.*;

/**
* @author Konstantin Pelykh ([email protected])
*
*
* @see "https://github.com/docker/docker/blob/master/api/client/commands.go"
*/
public class DockerClientImpl implements Closeable, DockerClient {
Expand Down Expand Up @@ -291,20 +292,29 @@ public CommitCmd commitCmd(String containerId) {

@Override
public BuildImageCmd buildImageCmd() {
return new BuildImageCmdImpl(getDockerCmdExecFactory()
.createBuildImageCmdExec());
return augmentBuildImageCmd(new BuildImageCmdImpl(getDockerCmdExecFactory()
.createBuildImageCmdExec()));
}

@Override
public BuildImageCmd buildImageCmd(File dockerFileOrFolder) {
return new BuildImageCmdImpl(getDockerCmdExecFactory()
.createBuildImageCmdExec(), dockerFileOrFolder);
return augmentBuildImageCmd(new BuildImageCmdImpl(getDockerCmdExecFactory()
.createBuildImageCmdExec(), dockerFileOrFolder));
}

@Override
public BuildImageCmd buildImageCmd(InputStream tarInputStream) {
return new BuildImageCmdImpl(getDockerCmdExecFactory()
.createBuildImageCmdExec(), tarInputStream);
@Override
public BuildImageCmd buildImageCmd(InputStream tarInputStream) {
return augmentBuildImageCmd(new BuildImageCmdImpl(getDockerCmdExecFactory()
.createBuildImageCmdExec(), tarInputStream));
}

private BuildImageCmd augmentBuildImageCmd(BuildImageCmd buildImageCmd) {
final AuthConfigurations authConfigurations = dockerClientConfig.getAuthConfigurations();
if (!authConfigurations.getConfigs().isEmpty()) {
buildImageCmd.withBuildAuthConfigs(authConfigurations);
}

return buildImageCmd;
}

@Override
Expand Down