From 124546f0e74ed462f8099e3b0f53ee164257b1ea Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Mon, 7 Dec 2020 11:03:03 -0500
Subject: [PATCH] adjust version, fix repoTag removal in docker driver

---
 bubble-server/pom.xml                                      | 4 ++--
 .../bubble/cloud/compute/docker/DockerComputeDriver.java   | 7 ++++---
 .../src/main/resources/META-INF/bubble/bubble.properties   | 2 +-
 pom.xml                                                    | 2 +-
 utils/pom.xml                                              | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/bubble-server/pom.xml b/bubble-server/pom.xml
index 462b0415..ccb5db2a 100644
--- a/bubble-server/pom.xml
+++ b/bubble-server/pom.xml
@@ -11,12 +11,12 @@
         <groupId>bubble</groupId>
         <artifactId>bubble</artifactId>
         <!-- @@BUBBLE_VERSION@@ this comment must remain above the version tag so that _set_version can update it -->
-        <version>1.5.2</version>
+        <version>1.4.51</version>
     </parent>
 
     <artifactId>bubble-server</artifactId>
     <!-- @@BUBBLE_VERSION@@ this comment must remain above the version tag so that _set_version can update it -->
-    <version>1.5.2</version>
+    <version>1.4.51</version>
 
     <repositories>
         <repository>
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 7db5a192..da8d591f 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
@@ -201,10 +201,11 @@ public class DockerComputeDriver extends ComputeServiceDriverBase {
             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);
+                final String repoTag = i.getRepoTags()[0];
+                if (repoTag.contains(":")) {
+                    name = repoTag.substring(repoTag.indexOf(":") + 1);
                 } else {
-                    name = i.getRepoTags()[0];
+                    name = repoTag;
                 }
             } else {
                 name = json(i.getRepoTags());
diff --git a/bubble-server/src/main/resources/META-INF/bubble/bubble.properties b/bubble-server/src/main/resources/META-INF/bubble/bubble.properties
index b1bfec6b..901523a0 100644
--- a/bubble-server/src/main/resources/META-INF/bubble/bubble.properties
+++ b/bubble-server/src/main/resources/META-INF/bubble/bubble.properties
@@ -1,3 +1,3 @@
 # Do not edit this file directly
 # Use _set_version to update the Bubble version in all files
-bubble.version=Adventure 1.5.2
+bubble.version=Adventure 1.4.51
diff --git a/pom.xml b/pom.xml
index 4f123d93..156aa972 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
     <groupId>bubble</groupId>
     <artifactId>bubble</artifactId>
     <!-- @@BUBBLE_VERSION@@ this comment must remain above the version tag so that _set_version can update it -->
-    <version>1.5.2</version>
+    <version>1.4.51</version>
     <packaging>pom</packaging>
 
     <licenses>
diff --git a/utils/pom.xml b/utils/pom.xml
index 03e6c7cc..b390f516 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -10,7 +10,7 @@ This code is available under the GNU Affero General Public License, version 3: h
     <groupId>bubble</groupId>
     <artifactId>utils</artifactId>
     <!-- @@BUBBLE_VERSION@@ this comment must remain above the version tag so that _set_version can update it -->
-    <version>1.5.2</version>
+    <version>1.4.51</version>
     <packaging>pom</packaging>
 
     <licenses>