Skip to content

Patch save image with tag #521

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

Closed
draoullig wants to merge 3 commits into from
Closed

Patch save image with tag #521

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
db06698
Patch save image with tag
Mar 23, 2016
f095547
Validate checkstyle and add test
Mar 24, 2016
c1b7ace
Rollback delete
Mar 24, 2016
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: 8 additions & 2 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,6 +12,7 @@
import com.github.dockerjava.api.command.SaveImageCmd;
import com.github.dockerjava.core.DockerClientConfig;
import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream;
import com.google.common.base.Strings;

public class SaveImageCmdExec extends AbstrSyncDockerCmdExec<SaveImageCmd, InputStream> implements SaveImageCmd.Exec {
private static final Logger LOGGER = LoggerFactory.getLogger(SaveImageCmdExec.class);
Expand All @@ -22,8 +23,13 @@ public SaveImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientC

@Override
protected InputStream execute(SaveImageCmd command) {
WebTarget webResource = getBaseResource().path("/images/" + command.getName() + "/get").queryParam("tag",
command.getTag());
// If tag is present, only tar the specific image
// else tar all the images with the same name
String name = command.getName();
if (!Strings.isNullOrEmpty(command.getTag())) {
name += ":" + command.getTag();
}
WebTarget webResource = getBaseResource().path("/images/" + name + "/get");

LOGGER.trace("GET: {}", webResource);
Response response = webResource.request().accept(MediaType.APPLICATION_JSON).get();
Expand Down
2 changes: 2 additions & 0 deletions 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 @@ -49,6 +49,8 @@ public void saveImage() throws Exception {

InputStream image = IOUtils.toBufferedInputStream(dockerClient.saveImageCmd("busybox").exec());
assertThat(image.available(), greaterThan(0));
InputStream image2 = IOUtils.toBufferedInputStream(dockerClient.saveImageCmd("busybox").withTag("latest").exec());
assertThat(image2.available(), greaterThan(0));

}

Expand Down