Skip to content

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

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 3 commits into from
Mar 29, 2015
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a89072
SaveImageCmd assumes that you have an auth config setup
xfournet Mar 19, 2015
fc3f7b7
SaveImageCmd API doesn't support X-Registry-Auth header
xfournet Mar 19, 2015
0366cdf
Fix logger for SaveImageCmd and SaveImageCmdImplTest classes
xfournet Mar 28, 2015
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
7 changes: 1 addition & 6 deletions src/main/java/com/github/dockerjava/api/command/SaveImageCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand All @@ -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
*/
Expand All @@ -34,4 +29,4 @@ public static interface Exec extends DockerCmdExec<SaveImageCmd, InputStream> {
}


}
}
4 changes: 1 addition & 3 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 @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 1 addition & 3 deletions src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/github/dockerjava/core/command/SaveImageCmdImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down