Skip to content

do not override pushed image's name #1407

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
bsideup merged 1 commit into from
Jun 1, 2020
Merged

do not override pushed image's name #1407

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
13 changes: 3 additions & 10 deletions docker-java-core/src/main/java/com/github/dockerjava/core/exec/PushImageCmdExec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import com.fasterxml.jackson.core.type.TypeReference;
import com.github.dockerjava.api.async.ResultCallback;
import com.github.dockerjava.api.command.PushImageCmd;
import com.github.dockerjava.api.model.AuthConfig;
import com.github.dockerjava.api.model.PushResponseItem;
import com.github.dockerjava.core.DockerClientConfig;
import com.github.dockerjava.core.InvocationBuilder;
Expand All @@ -22,17 +21,11 @@ public PushImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientC
super(baseResource, dockerClientConfig);
}

private String name(PushImageCmd command) {
String name = command.getName();
AuthConfig authConfig = command.getAuthConfig();
return (name.contains("/") || authConfig == null) ? name : authConfig.getUsername();
}

@Override
protected Void execute0(PushImageCmd command, ResultCallback<PushResponseItem> resultCallback) {

WebTarget webResource = getBaseResource().path("/images/" + name(command) + "/push").queryParam("tag",
command.getTag());
WebTarget webResource = getBaseResource().path("/images/{imageName}/push")
.resolveTemplate("imageName", command.getName())
.queryParam("tag", command.getTag());

LOGGER.trace("POST: {}", webResource);

Expand Down
2 changes: 1 addition & 1 deletion docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public void pushNonExistentImage() throws Exception {
exception.expect(NotFoundException.class);
}

dockerRule.getClient().pushImageCmd("local/" + UUID.randomUUID().toString().replace("-", ""))
dockerRule.getClient().pushImageCmd(UUID.randomUUID().toString().replace("-", ""))
.start()
.awaitCompletion(30, TimeUnit.SECONDS); // exclude infinite await sleep

Expand Down