From 27df433b4ef8123dce4739a84c996cdd7763dd18 Mon Sep 17 00:00:00 2001 From: Jakub Kubrynski Date: Sat, 27 Aug 2016 20:28:22 +0200 Subject: [PATCH 1/4] Fix #682 - Add LogPath to docker inspect response --- .../dockerjava/api/command/InspectContainerResponse.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java index 59a267e9d..8de0be285 100644 --- a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java +++ b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java @@ -53,6 +53,9 @@ public class InspectContainerResponse { @JsonProperty("HostsPath") private String hostsPath; + @JsonProperty("LogPath") + private String logPath; + @JsonProperty("Id") private String id; @@ -168,6 +171,10 @@ public String getHostsPath() { return hostsPath; } + public String getLogPath() { + return logPath; + } + public String getName() { return name; } From 508d84ecf845efb5d480729697fa182bc1f66ffd Mon Sep 17 00:00:00 2001 From: Jakub Kubrynski Date: Sat, 27 Aug 2016 22:04:14 +0200 Subject: [PATCH 2/4] Fix #682 - Add LogPath to docker inspect response - fixes after code review --- .../github/dockerjava/api/command/InspectContainerResponse.java | 1 + .../dockerjava/api/command/InspectContainerResponseTest.java | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java index 8de0be285..3f2810764 100644 --- a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java +++ b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java @@ -171,6 +171,7 @@ public String getHostsPath() { return hostsPath; } + @CheckForNull public String getLogPath() { return logPath; } diff --git a/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java b/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java index f64cf4ead..11c5eb2e8 100644 --- a/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java +++ b/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java @@ -51,6 +51,7 @@ public void roundTrip_full() throws IOException { assertEquals(response.getVolumesRW()[1].getVolume().getPath(), "/bar/foo/myvol2"); assertFalse(response.getVolumesRW()[1].getAccessMode().toBoolean()); assertTrue(response.getVolumesRW()[0].getAccessMode().toBoolean()); + assertEquals(response.getLogPath(), "/mnt/sda1/var/lib/docker/containers/469e5edd8d5b33e3c905a7ffc97360ec6ee211d6782815fbcd144568045819e1/469e5edd8d5b33e3c905a7ffc97360ec6ee211d6782815fbcd144568045819e1-json.log"); } @Test From 528a6783ae23abb6eac8febb7dbf7ae44eb71c3e Mon Sep 17 00:00:00 2001 From: Jakub Kubrynski Date: Sat, 27 Aug 2016 22:06:32 +0200 Subject: [PATCH 3/4] Fix #682 - Add LogPath to docker inspect response - add javadoc --- .../dockerjava/api/command/InspectContainerResponse.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java index 3f2810764..c8027b0ed 100644 --- a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java +++ b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java @@ -53,6 +53,9 @@ public class InspectContainerResponse { @JsonProperty("HostsPath") private String hostsPath; + /** + * @since {@link RemoteApiVersion#VERSION_1_17} + */ @JsonProperty("LogPath") private String logPath; From 230eafd30b35470a1e2be7503e569f4cbaacc382 Mon Sep 17 00:00:00 2001 From: Jakub Kubrynski Date: Sat, 27 Aug 2016 22:07:32 +0200 Subject: [PATCH 4/4] Fix #682 - Add LogPath to docker inspect response - clean test assertion --- .../dockerjava/api/command/InspectContainerResponseTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java b/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java index 11c5eb2e8..cd4562b4a 100644 --- a/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java +++ b/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java @@ -22,6 +22,7 @@ import static com.github.dockerjava.test.serdes.JSONTestHelper.testRoundTrip; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.isEmptyString; import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.core.IsNot.not; @@ -51,7 +52,7 @@ public void roundTrip_full() throws IOException { assertEquals(response.getVolumesRW()[1].getVolume().getPath(), "/bar/foo/myvol2"); assertFalse(response.getVolumesRW()[1].getAccessMode().toBoolean()); assertTrue(response.getVolumesRW()[0].getAccessMode().toBoolean()); - assertEquals(response.getLogPath(), "/mnt/sda1/var/lib/docker/containers/469e5edd8d5b33e3c905a7ffc97360ec6ee211d6782815fbcd144568045819e1/469e5edd8d5b33e3c905a7ffc97360ec6ee211d6782815fbcd144568045819e1-json.log"); + assertThat(response.getLogPath(), is("/mnt/sda1/var/lib/docker/containers/469e5edd8d5b33e3c905a7ffc97360ec6ee211d6782815fbcd144568045819e1/469e5edd8d5b33e3c905a7ffc97360ec6ee211d6782815fbcd144568045819e1-json.log")); } @Test