fix(core): Refine docker imageName selection when project is snapshot. …

…Fix #952
jreleaser · Oct 27, 2022 · 241a8df · 241a8df
1 parent 313ec3f
commit 241a8df
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/...ser-model-impl/src/main/java/org/jreleaser/model/internal/common/AbstractModelObject.java b/...ser-model-impl/src/main/java/org/jreleaser/model/internal/common/AbstractModelObject.java
@@ -67,9 +67,7 @@ protected <T> Set<T> merge(Set<T> existing, Set<T> incoming) {
         Set<T> s1 = new LinkedHashSet<>();
         if (null != existing) s1.addAll(existing);
         if (null != incoming && !incoming.isEmpty()) {
-            Set<T> s2 = new LinkedHashSet<>(incoming);
-            s2.removeAll(s1);
-            s1.addAll(s2);
+            s1.addAll(incoming);
         }
 
         return s1;

diff --git a/...l-impl/src/main/java/org/jreleaser/model/internal/validation/DockerPackagerValidator.java b/...l-impl/src/main/java/org/jreleaser/model/internal/validation/DockerPackagerValidator.java
@@ -127,7 +127,8 @@ public static void validateDocker(JReleaserContext context, Distribution distrib
             Optional<String> imageName = packager.getImageNames().stream()
                 .filter(n -> n.endsWith(":{{tagName}}") || n.endsWith(":{{ tagName }}"))
                 .findFirst();
-            packager.setImageNames(singleton(imageName.orElse("{{repoOwner}}/{{distributionName}}:{{tagName}}")));
+            // use the first finding or the first imageName
+            packager.setImageNames(singleton(imageName.orElse(packager.getImageNames().iterator().next())));
         }
 
         validateCommands(packager, parentPackager);