From 0433b79140edcc25f42e7c949d6765e48cf2eeca Mon Sep 17 00:00:00 2001 From: Jonathan Cobb Date: Mon, 7 Dec 2020 10:14:55 -0500 Subject: [PATCH] fix image filter --- .../bubble/cloud/compute/docker/DockerComputeDriver.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bubble-server/src/main/java/bubble/cloud/compute/docker/DockerComputeDriver.java b/bubble-server/src/main/java/bubble/cloud/compute/docker/DockerComputeDriver.java index 7a9c9cf1..815287ff 100644 --- a/bubble-server/src/main/java/bubble/cloud/compute/docker/DockerComputeDriver.java +++ b/bubble-server/src/main/java/bubble/cloud/compute/docker/DockerComputeDriver.java @@ -31,6 +31,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.function.Predicate; +import java.util.stream.Collectors; import static bubble.service.packer.PackerJob.PACKER_IMAGE_PREFIX; import static java.lang.Boolean.parseBoolean; @@ -184,7 +185,9 @@ public class DockerComputeDriver extends ComputeServiceDriverBase { @Override public List getAllPackerImages() { final DockerClient dc = getDockerClient(); - final List images = dc.listImagesCmd().withImageNameFilter(PACKER_IMAGE_PREFIX).withLabelFilter(MapBuilder.build(LABEL_IMAGE, PACKER_IMAGE_PREFIX)).exec(); + final List images = dc.listImagesCmd().exec().stream() + .filter(i -> i.getLabels().containsKey(LABEL_IMAGE) && i.getLabels().get(LABEL_IMAGE).startsWith(PACKER_IMAGE_PREFIX)) + .collect(Collectors.toList()); final List packerImages = new ArrayList<>(); for (Image i : images) { final PackerImage p = new PackerImage();