From f70dcfecbc5e4535ef85561f10520443300959d2 Mon Sep 17 00:00:00 2001 From: "eric.fjosne" Date: Mon, 17 Aug 2015 16:03:37 +0200 Subject: [PATCH 1/6] Added imagename filter --- .../dockerjava/api/command/ListImagesCmd.java | 2 ++ .../dockerjava/core/command/ListImagesCmdImpl.java | 13 +++++++++++++ .../github/dockerjava/jaxrs/ListImagesCmdExec.java | 3 +++ 3 files changed, 18 insertions(+) diff --git a/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java b/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java index 170ed8102..967eefb5a 100644 --- a/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java +++ b/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java @@ -15,11 +15,13 @@ public interface ListImagesCmd extends SyncDockerCmd> { public String getFilters(); + public String getImageNameFilter(); public boolean hasShowAllEnabled(); public ListImagesCmd withShowAll(boolean showAll); + public ListImagesCmd withImageNameFilter(String imageName); public ListImagesCmd withFilters(String filters); public static interface Exec extends DockerCmdSyncExec> { diff --git a/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java index ddd4dc79f..bed4a78a6 100644 --- a/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java +++ b/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java @@ -17,6 +17,7 @@ */ public class ListImagesCmdImpl extends AbstrDockerCmd> implements ListImagesCmd { + private String imageNameFilter; private String filters; private boolean showAll = false; @@ -53,4 +54,16 @@ public String toString() { return new StringBuilder("images ").append(showAll ? "--all=true" : "") .append(filters != null ? "--filter " + filters : "").toString(); } + + @Override + public ListImagesCmd withImageNameFilter(String imageNameFilter) { + checkNotNull(imageNameFilter, "image name filter has not been specified"); + this.imageNameFilter = imageNameFilter; + return this; + } + + @Override + public String getImageNameFilter() { + return this.imageNameFilter; + } } diff --git a/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java index fa8409cb8..912fc2fb0 100644 --- a/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java +++ b/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java @@ -29,6 +29,9 @@ protected List execute(ListImagesCmd command) { if (command.getFilters() != null) webResource = webResource.queryParam("filters", urlPathSegmentEscaper().escape(command.getFilters())); + + if (command.getImageNameFilter() != null) + webResource = webResource.queryParam("filter", urlPathSegmentEscaper().escape(command.getImageNameFilter())); LOGGER.trace("GET: {}", webResource); From 23224f54cf91af45535c1ae6eea97eb8f5a606de Mon Sep 17 00:00:00 2001 From: "eric.fjosne" Date: Mon, 17 Aug 2015 16:53:59 +0200 Subject: [PATCH 2/6] Fixed comments from Kanstantsin Shautsou --- .../dockerjava/api/command/ListImagesCmd.java | 2 ++ .../core/command/ListImagesCmdImpl.java | 18 +++++++++--------- .../dockerjava/jaxrs/ListImagesCmdExec.java | 6 ++++-- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java b/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java index 967eefb5a..419b48a68 100644 --- a/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java +++ b/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java @@ -15,6 +15,7 @@ public interface ListImagesCmd extends SyncDockerCmd> { public String getFilters(); + public String getImageNameFilter(); public boolean hasShowAllEnabled(); @@ -22,6 +23,7 @@ public interface ListImagesCmd extends SyncDockerCmd> { public ListImagesCmd withShowAll(boolean showAll); public ListImagesCmd withImageNameFilter(String imageName); + public ListImagesCmd withFilters(String filters); public static interface Exec extends DockerCmdSyncExec> { diff --git a/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java index bed4a78a6..e5cdb3536 100644 --- a/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java +++ b/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java @@ -55,15 +55,15 @@ public String toString() { .append(filters != null ? "--filter " + filters : "").toString(); } - @Override - public ListImagesCmd withImageNameFilter(String imageNameFilter) { - checkNotNull(imageNameFilter, "image name filter has not been specified"); - this.imageNameFilter = imageNameFilter; - return this; - } + @Override + public ListImagesCmd withImageNameFilter(String imageNameFilter) { + checkNotNull(imageNameFilter, "image name filter not specified"); + this.imageNameFilter = imageNameFilter; + return this; + } - @Override - public String getImageNameFilter() { - return this.imageNameFilter; + @Override + public String getImageNameFilter() { + return this.imageNameFilter; } } diff --git a/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java index 912fc2fb0..464190776 100644 --- a/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java +++ b/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java @@ -27,11 +27,13 @@ protected List execute(ListImagesCmd command) { WebTarget webResource = getBaseResource().path("/images/json").queryParam("all", command.hasShowAllEnabled() ? "1" : "0"); - if (command.getFilters() != null) + if (command.getFilters() != null) { webResource = webResource.queryParam("filters", urlPathSegmentEscaper().escape(command.getFilters())); + } - if (command.getImageNameFilter() != null) + if (command.getImageNameFilter() != null) { webResource = webResource.queryParam("filter", urlPathSegmentEscaper().escape(command.getImageNameFilter())); + } LOGGER.trace("GET: {}", webResource); From 34b3a5f3ddc73dd720291ca1e96ba3e9043273e4 Mon Sep 17 00:00:00 2001 From: "eric.fjosne" Date: Mon, 17 Aug 2015 16:56:21 +0200 Subject: [PATCH 3/6] Fixed indentation --- .../java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java index 464190776..5cffb2239 100644 --- a/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java +++ b/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java @@ -32,7 +32,7 @@ protected List execute(ListImagesCmd command) { } if (command.getImageNameFilter() != null) { - webResource = webResource.queryParam("filter", urlPathSegmentEscaper().escape(command.getImageNameFilter())); + webResource = webResource.queryParam("filter", urlPathSegmentEscaper().escape(command.getImageNameFilter())); } LOGGER.trace("GET: {}", webResource); From 85bf86a9912b70b644e9153529efe27aa75c022d Mon Sep 17 00:00:00 2001 From: "eric.fjosne" Date: Mon, 17 Aug 2015 16:58:23 +0200 Subject: [PATCH 4/6] Fixed indentation, added imageNameFilter in the toString() --- .../github/dockerjava/core/command/ListImagesCmdImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java index e5cdb3536..0128996f4 100644 --- a/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java +++ b/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java @@ -52,7 +52,8 @@ public ListImagesCmd withFilters(String filter) { @Override public String toString() { return new StringBuilder("images ").append(showAll ? "--all=true" : "") - .append(filters != null ? "--filter " + filters : "").toString(); + .append(filters != null ? "--filters " + filters : "") + .append(imageNameFilter != null ? "--filter " + imageNameFilter : "").toString(); } @Override @@ -65,5 +66,5 @@ public ListImagesCmd withImageNameFilter(String imageNameFilter) { @Override public String getImageNameFilter() { return this.imageNameFilter; - } + } } From a60d9fcb805acbc76483dff08cee66276cb6e3c3 Mon Sep 17 00:00:00 2001 From: "eric.fjosne" Date: Mon, 17 Aug 2015 17:00:26 +0200 Subject: [PATCH 5/6] Fixed indentation --- .../com/github/dockerjava/core/command/ListImagesCmdImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java index 0128996f4..506f17f29 100644 --- a/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java +++ b/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java @@ -66,5 +66,5 @@ public ListImagesCmd withImageNameFilter(String imageNameFilter) { @Override public String getImageNameFilter() { return this.imageNameFilter; - } + } } From 4d61fee0f5e3c2dce062064b08a26aa569f1151e Mon Sep 17 00:00:00 2001 From: "eric.fjosne" Date: Wed, 25 Nov 2015 18:51:10 +0100 Subject: [PATCH 6/6] Added legacy registry support --- .../java/com/github/dockerjava/api/model/PullResponseItem.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java b/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java index 834060b99..789f9a279 100644 --- a/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java +++ b/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java @@ -23,7 +23,7 @@ public boolean isPullSuccessIndicated() { } return (getStatus().contains("Download complete") || getStatus().contains("Image is up to date") || getStatus() - .contains("Downloaded newer image")); + .contains("Downloaded newer image") || getStatus().contains("this image was pulled from a legacy registry")); } }