From 3d8872505146203d2ca7341162aed0baa362d4da Mon Sep 17 00:00:00 2001 From: Jonathan Cobb Date: Mon, 7 Dec 2020 10:49:17 -0500 Subject: [PATCH] strip docker repo prefix from PackerImage.name --- .../compute/docker/DockerComputeDriver.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) 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 eb00f4c6..7db5a192 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 @@ -197,9 +197,21 @@ public class DockerComputeDriver extends ComputeServiceDriverBase { final List packerImages = new ArrayList<>(); for (Image i : images) { final PackerImage p = new PackerImage(); + final String name; + if (empty(i.getRepoTags())) { + name = i.getId(); + } else if (i.getRepoTags().length == 1) { + if (i.getRepoTags()[0].contains(":")) { + name = i.getRepoTags()[0].substring(repository.indexOf(":")+1); + } else { + name = i.getRepoTags()[0]; + } + } else { + name = json(i.getRepoTags()); + } p.setId(i.getId()); - p.setName(empty(i.getRepoTags()) ? i.getId() : i.getRepoTags().length == 1 ? i.getRepoTags()[0] : json(i.getRepoTags())); - p.setRegions(null); + p.setName(name); + p.setRegions(CLOUD_REGIONS_ARRAY); packerImages.add(p); } return packerImages;