From a3090ab07fdbe27e80be5917a9ca5214b32068a7 Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Sun, 13 Dec 2020 17:57:48 +0100 Subject: [PATCH] workaround removed filter operation with newer docker versions --- .../ide/eclipse/boot/dash/docker/runtarget/DockerApp.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.docker/src/org/springframework/ide/eclipse/boot/dash/docker/runtarget/DockerApp.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.docker/src/org/springframework/ide/eclipse/boot/dash/docker/runtarget/DockerApp.java index 031eb8db0..59a929b2d 100644 --- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.docker/src/org/springframework/ide/eclipse/boot/dash/docker/runtarget/DockerApp.java +++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.docker/src/org/springframework/ide/eclipse/boot/dash/docker/runtarget/DockerApp.java @@ -73,6 +73,7 @@ import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.command.CreateContainerCmd; import com.github.dockerjava.api.command.CreateContainerResponse; import com.github.dockerjava.api.command.InspectImageResponse; +import com.github.dockerjava.api.command.ListImagesCmd; import com.github.dockerjava.api.exception.NotModifiedException; import com.github.dockerjava.api.model.Container; import com.github.dockerjava.api.model.ExposedPort; @@ -437,7 +438,12 @@ Successfully tagged fui:latest if (imageTag.startsWith(DOCKER_IO_LIBRARY)) { imageTag = imageTag.substring(DOCKER_IO_LIBRARY.length()); } - List images = client.listImagesCmd().withImageNameFilter(imageTag).exec(); + +// List images = client.listImagesCmd().withImageNameFilter(imageTag).exec(); + ListImagesCmd listImagesCmd = client.listImagesCmd(); + listImagesCmd.getFilters().put("reference", Arrays.asList(imageTag)); + List images = listImagesCmd.exec(); + if (images.isEmpty()) { // maybe the 'imageTag' is not actually a tag but an id/hash. InspectImageResponse inspect = client.inspectImageCmd(imageTag).exec();