Skip to content

Inspect container command now shows sizes if requested #572

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
May 12, 2016
Merged

Inspect container command now shows sizes if requested #572

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
4fc98a0
Docker inspect command now shows sizes if request.
May 6, 2016
61869c8
Adds tests for inspect command when size is used.
May 9, 2016
72b2e73
Strenghten tests for withSize in InspectContainer.
May 9, 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
4 changes: 4 additions & 0 deletions src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ public interface InspectContainerCmd extends SyncDockerCmd<InspectContainerRespo

InspectContainerCmd withContainerId(@Nonnull String containerId);

InspectContainerCmd withSize(Boolean showSize);
Copy link
Copy Markdown
Member

@KostyaSha KostyaSha May 12, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

or then primitive here


boolean getSize();
Copy link
Copy Markdown
Member

@KostyaSha KostyaSha May 12, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be object?

Copy link
Copy Markdown
Contributor

@marcuslinke marcuslinke May 12, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed while merge.


/**
* @throws NotFoundException
* No such container
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ public class InspectContainerResponse {
@JsonProperty("Id")
private String id;

@JsonProperty("SizeRootFs")
private Integer sizeRootFs;

@JsonProperty("Image")
private String imageId;

Expand Down Expand Up @@ -102,6 +105,10 @@ public String getId() {
return id;
}

public Integer getSizeRootFs() {
return sizeRootFs;
}

public String getCreated() {
return created;
}
Expand Down
12 changes: 12 additions & 0 deletions src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ public class InspectContainerCmdImpl extends AbstrDockerCmd<InspectContainerCmd,
InspectContainerCmd {

private String containerId;
private boolean size;

public InspectContainerCmdImpl(InspectContainerCmd.Exec exec, String containerId) {
super(exec);
Expand All @@ -31,6 +32,17 @@ public InspectContainerCmd withContainerId(String containerId) {
return this;
}

@Override
public InspectContainerCmd withSize(Boolean showSize) {
this.size = showSize;
return this;
}

@Override
public boolean getSize() {
return size;
}

/**
* @throws NotFoundException
* No such container
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@ public InspectContainerCmdExec(WebTarget baseResource, DockerClientConfig docker

@Override
protected InspectContainerResponse execute(InspectContainerCmd command) {
WebTarget webResource = getBaseResource().path("/containers/{id}/json").resolveTemplate("id",
command.getContainerId());
WebTarget webResource = getBaseResource().path("/containers/{id}/json")
.queryParam("size", command.getSize())
.resolveTemplate("id", command.getContainerId());

LOGGER.debug("GET: {}", webResource);
return webResource.request().accept(MediaType.APPLICATION_JSON).get(InspectContainerResponse.class);
Expand Down
19 changes: 19 additions & 0 deletions src/test/java/com/github/dockerjava/core/command/InspectContainerCmdImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import java.lang.reflect.Method;
import java.security.SecureRandom;

import com.github.dockerjava.api.command.InspectContainerCmd;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.ITestResult;
Expand Down Expand Up @@ -63,6 +64,24 @@ public void inspectContainer() throws DockerException {

}

@Test()
public void inspectContainerWithSize() throws DockerException {

String containerName = "generated_" + new SecureRandom().nextInt();

CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("top")
.withName(containerName).exec();
LOG.info("Created container {}", container.toString());
assertThat(container.getId(), not(isEmptyString()));

InspectContainerCmd command = dockerClient.inspectContainerCmd(container.getId()).withSize(true);
assertTrue(command.getSize());
InspectContainerResponse containerInfo = command.exec();
assertEquals(containerInfo.getId(), container.getId());
assertNotNull(containerInfo.getSizeRootFs());
assertTrue(containerInfo.getSizeRootFs().intValue() > 0 );
}

@Test(expectedExceptions = NotFoundException.class)
public void inspectNonExistingContainer() throws DockerException {
dockerClient.inspectContainerCmd("non-existing").exec();
Expand Down
20 changes: 20 additions & 0 deletions src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import java.lang.reflect.Method;
import java.security.SecureRandom;

import com.github.dockerjava.api.command.InspectContainerCmd;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.ITestResult;
Expand Down Expand Up @@ -63,6 +64,25 @@ public void inspectContainer() throws DockerException {

}

@Test()
public void inspectContainerWithSize() throws DockerException {

String containerName = "generated_" + new SecureRandom().nextInt();

CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("top")
.withName(containerName).exec();
LOG.info("Created container {}", container.toString());
assertThat(container.getId(), not(isEmptyString()));

InspectContainerCmd command = dockerClient.inspectContainerCmd(container.getId())
.withSize(true);
assertTrue(command.getSize());
InspectContainerResponse containerInfo = command.exec();
assertEquals(containerInfo.getId(), container.getId());
assertNotNull(containerInfo.getSizeRootFs());
assertTrue(containerInfo.getSizeRootFs().intValue() > 0 );
}

@Test(expectedExceptions = NotFoundException.class)
public void inspectNonExistingContainer() throws DockerException {
dockerClient.inspectContainerCmd("non-existing").exec();
Expand Down