Skip to content

Add RootDir property to GraphData #585

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 4 commits into from
Jun 2, 2016
Merged

Add RootDir property to GraphData #585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a1d1e3d
Fixes Issue #584
jrrickard May 24, 2016
3f71f1f
Fixes Issue #584
jrrickard May 24, 2016
9b8ca72
Fixes Issue #584
jrrickard May 24, 2016
d05e380
Fixes Issue #584
jrrickard May 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
20 changes: 20 additions & 0 deletions src/main/java/com/github/dockerjava/api/command/GraphData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@
* @author Kanstantsin Shautsou
*/
public class GraphData {

@JsonProperty("RootDir")
private String rootDir;

@JsonProperty("DeviceId")
private String deviceId;

Expand All @@ -21,6 +25,22 @@ public class GraphData {
@JsonProperty("DeviceSize")
private String deviceSize;

/**
* @see #rootDir
*/
@CheckForNull
public String getRootDir() {
return rootDir;
}

/**
* @see #rootDir
*/
public GraphData withRootDir(String rootDir) {
this.rootDir = rootDir;
return this;
}

/**
* @see #deviceId
*/
Expand Down
19 changes: 18 additions & 1 deletion src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,4 +189,21 @@ public void serder1_22_inspect_doc() throws IOException {
assertThat(data.getDeviceSize(),
is("171798691840"));
}
}

@Test
private void testOverlayNetworkRootDir() throws IOException {
final ObjectMapper mapper = new ObjectMapper();
final JavaType type = mapper.getTypeFactory().constructType(InspectImageResponse.class);

final InspectImageResponse inspectImage = testRoundTrip(VERSION_1_22, "images/overlay/inspectOverlay.json", type);

final GraphData overlayGraphData = new GraphData()
.withRootDir("/var/lib/docker/overlay/7e8d362d6b78d47eafe4863fd129cbcada35dbd419d7188cc1dbf1233d505576/root");
final GraphDriver overlayGraphDriver = new GraphDriver().withName("overlay").withData(overlayGraphData);
final GraphDriver graphDriver = inspectImage.getGraphDriver();
assertThat(graphDriver, notNullValue());
assertThat(graphDriver, equalTo(overlayGraphDriver));
assertThat(graphDriver.getName(), is("overlay"));
assertThat(graphDriver.getData(), equalTo(overlayGraphData));
}
}
93 changes: 93 additions & 0 deletions src/test/resources/samples/1.22/images/overlay/inspectOverlay.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
{
"Id": "sha256:0ac989a7cba2ce7f5fbe5d520b338e780055ec251371ee35f7462ae9944696c5",
"RepoTags": [
"test-image:latest"
],
"RepoDigests": [],
"Parent": "",
"Comment": "",
"Created": "2016-05-24T19:25:01.31608131Z",
"Container": "221f000eccdec85b74cd4f4f37c7c0392d0f620bee45e9618cac3e57409a6d2c",
"ContainerConfig": {
"Hostname": "6ea525e7ec5c",
"Domainname": "",
"User": "",
"AttachStdin": false,
"AttachStdout": false,
"AttachStderr": false,
"Tty": false,
"OpenStdin": false,
"StdinOnce": false,
"Env": [
"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
],
"Cmd": [
"/bin/sh",
"-c",
"#(nop) ENTRYPOINT [\"bin/run.sh\"]"
],
"Image": "sha256:f8321fac5b5484874c1c5c02719905ec815c8ad20c2bc66222cfde19cd0491b7",
"Volumes": {
"/var/lib/docker": {}
},
"WorkingDir": "/opt",
"Entrypoint": [
"bin/run.sh"
],
"OnBuild": [],
"Labels": {}
},
"DockerVersion": "1.11.1",
"Author": "",
"Config": {
"Hostname": "6ea525e7ec5c",
"Domainname": "",
"User": "",
"AttachStdin": false,
"AttachStdout": false,
"AttachStderr": false,
"Tty": false,
"OpenStdin": false,
"StdinOnce": false,
"Env": [
"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
],
"Cmd": null,
"Image": "sha256:f8321fac5b5484874c1c5c02719905ec815c8ad20c2bc66222cfde19cd0491b7",
"Volumes": {
"/var/lib/docker": {}
},
"WorkingDir": "/opt",
"Entrypoint": [
"bin/run.sh"
],
"OnBuild": [],
"Labels": {}
},
"Architecture": "amd64",
"Os": "linux",
"Size": 345943268,
"VirtualSize": 345943268,
"GraphDriver": {
"Name": "overlay",
"Data": {
"RootDir": "/var/lib/docker/overlay/7e8d362d6b78d47eafe4863fd129cbcada35dbd419d7188cc1dbf1233d505576/root"
}
},
"RootFS": {
"Type": "layers",
"Layers": [
"sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef",
"sha256:bd8153423e4131205018c431283e0a08298b291838db9bc6c19620523f5a818c",
"sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef",
"sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef",
"sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef",
"sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef",
"sha256:bb0716c3f5f5be1e5ee6912f7e9f44193898e0b3ed9031a0416f8ca262e89975",
"sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef",
"sha256:58845ae9bfa7659900a9b30abb2c96330eff09bfbc6521ea77937ba60f8cc131",
"sha256:8c22161a61c24eb6f7aa130d45189354fd8dbe9467e5b2debf828908113eacb0",
"sha256:0c0c9045d2542e7845a2bdd8ead0e0fb2722be2c07c5553838dd61ffe051d672"
]
}
}