Merge pull request #20404 from geoand/#20376

Reinstate ability to set an empty container-image group
quarkusio · Sep 27, 2021 · 4c39153 · 4c39153
2 parents fd3ac77 + 10ec5e4
commit 4c39153
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/.../deployment/src/main/java/io/quarkus/container/image/deployment/ContainerImageConfig.java b/.../deployment/src/main/java/io/quarkus/container/image/deployment/ContainerImageConfig.java
@@ -110,6 +110,8 @@ public Optional<String> getEffectiveGroup() {
                     return Optional.empty();
                 }
                 return Optional.of(originalGroup.toLowerCase().replace(' ', '-'));
+            } else if (originalGroup.isEmpty()) {
+                return Optional.empty();
             }
         }
         return group;

diff --git a/...ge/maven-invoker-way/src/it/container-build-jib/src/main/resources/application.properties b/...ge/maven-invoker-way/src/it/container-build-jib/src/main/resources/application.properties
@@ -1,2 +1,3 @@
 # Configuration file
-# key = value
+# key = value
+quarkus.container-image.group=
diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib/verify.groovy b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib/verify.groovy
@@ -11,9 +11,8 @@ try {
     return
 }
 
-String group = System.getProperty("user.name")
-assert ExecUtil.exec("docker", "images", group + "/container-build-jib")
-assert ExecUtil.exec("docker", "rmi", group + "/container-build-jib:0.1-SNAPSHOT")
+assert ExecUtil.exec("docker", "images", "container-build-jib")
+assert ExecUtil.exec("docker", "rmi", "container-build-jib:0.1-SNAPSHOT")
 
 
 Path pathInIT = Paths.get("target", "it", "container-build-jib", "target")
@@ -36,7 +35,7 @@ propertiesFile.withInputStream {
 }
 
 assert properties.type == 'jar-container'
-assert properties."metadata.container-image" == group + "/container-build-jib:0.1-SNAPSHOT"
+assert properties."metadata.container-image" == "container-build-jib:0.1-SNAPSHOT"
 
 
 assert Files.exists(target.resolve("jib-image.digest"))