Only push latest when no tags are specified

This makes sure pushing works the same for jib and docker mode. Signed-off-by: Martin Panzer <postremus1996@googlemail.com>
fabric8io · Oct 6, 2021 · d6efe77 · d6efe77
1 parent 3118642
commit d6efe77
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 38 deletions.
diff --git a/src/main/java/io/fabric8/maven/docker/service/JibBuildService.java b/src/main/java/io/fabric8/maven/docker/service/JibBuildService.java
@@ -90,7 +90,7 @@ public void push(Collection<ImageConfiguration> imageConfigs, int retries, Regis
                 JibServiceUtil.jibPush(
                         imageConfiguration,
                         getRegistryCredentials(registryConfig, true, imageConfiguration, log),
-                        getBuildTarArchive(imageConfiguration, mojoParameters),
+                        getBuildTarArchive(imageConfiguration, mojoParameters), skipTag,
                         log
                 );
             }

diff --git a/src/main/java/io/fabric8/maven/docker/service/RegistryService.java b/src/main/java/io/fabric8/maven/docker/service/RegistryService.java
@@ -59,16 +59,16 @@ public void pushImages(Collection<ImageConfiguration> imageConfigs,
 
                 AuthConfig authConfig = createAuthConfig(true, new ImageName(name).getUser(), configuredRegistry, registryConfig);
 
-                long start = System.currentTimeMillis();
-                docker.pushImage(name, authConfig, configuredRegistry, retries);
-                log.info("Pushed %s in %s", name, EnvUtil.formatDurationTill(start));
-
-                if (!skipTag) {
-                    for (String tag : imageConfig.getBuildConfiguration().getTags()) {
+                if (!skipTag && !buildConfig.getTags().isEmpty()) {
+                    for (String tag : buildConfig.getTags()) {
                         if (tag != null) {
                             docker.pushImage(new ImageName(name, tag).getFullName(), authConfig, configuredRegistry, retries);
                         }
                     }
+                } else {
+                    long start = System.currentTimeMillis();
+                    docker.pushImage(name, authConfig, configuredRegistry, retries);
+                    log.info("Pushed %s in %s", name, EnvUtil.formatDurationTill(start));
                 }
             }
         }

diff --git a/src/main/java/io/fabric8/maven/docker/util/JibServiceUtil.java b/src/main/java/io/fabric8/maven/docker/util/JibServiceUtil.java
@@ -123,14 +123,18 @@ public static String getFullImageName(ImageConfiguration imageConfiguration, Str
      * @param tarArchive         tar archive built during build goal
      * @param log                Logger
      */
-    public static void jibPush(ImageConfiguration imageConfiguration, Credential pushCredentials, File tarArchive, Logger log) {
-        BuildImageConfiguration buildImageConfiguration = imageConfiguration.getBuildConfiguration();
-        String imageName = getFullImageName(imageConfiguration, null);
+    public static void jibPush(ImageConfiguration imageConfiguration, Credential pushCredentials, File tarArchive, boolean skipTag, Logger log) {
+        BuildImageConfiguration buildConfig = imageConfiguration.getBuildConfiguration();
         try {
-            for (String tag : getAllImageTags(buildImageConfiguration.getTags(), imageName)) {
-                String imageNameWithTag = getFullImageName(imageConfiguration, tag);
-                log.info("Pushing image: %s", imageNameWithTag);
-                pushImage(TarImage.at(tarArchive.toPath()), imageNameWithTag, pushCredentials, log);
+            if (!skipTag && !buildConfig.getTags().isEmpty()) {
+                for (String tag : buildConfig.getTags()) {
+                    String imageNameWithTag = getFullImageName(imageConfiguration, tag);
+                    log.info("Pushing image: %s", imageNameWithTag);
+                    pushImage(TarImage.at(tarArchive.toPath()), imageNameWithTag, pushCredentials, log);
+                }
+            } else {
+                String imageName = getFullImageName(imageConfiguration, null);
+                pushImage(TarImage.at(tarArchive.toPath()), imageName, pushCredentials, log);
             }
         } catch (IllegalStateException e) {
             log.error("Exception occurred while pushing the image: %s", imageConfiguration.getName());
@@ -194,15 +198,6 @@ private static JibContainerBuilder populateContainerBuilderFromImageConfiguratio
         return containerBuilder;
     }
 
-    static Set<String> getAllImageTags(List<String> tags, String imageName) {
-        ImageName tempImage = new ImageName(imageName);
-        Set<String> tagSet = tags.stream().filter(Objects::nonNull).collect(Collectors.toSet());
-        if (!tempImage.getTag().isEmpty()) {
-            tagSet.add(tempImage.getTag());
-        }
-        return tagSet;
-    }
-
     static ImageFormat getImageFormat(String jibImageFormat) {
         if (jibImageFormat != null && jibImageFormat.toLowerCase().equalsIgnoreCase("oci")) {
             return ImageFormat.OCI;

diff --git a/src/test/java/io/fabric8/maven/docker/service/JibBuildServiceTest.java b/src/test/java/io/fabric8/maven/docker/service/JibBuildServiceTest.java
@@ -140,7 +140,7 @@ public void testPushWithNoConfigurations(@Mocked JibServiceUtil jibServiceUtil)
         // Then
         // @formatter:off
         new Verifications() {{
-            JibServiceUtil.jibPush((ImageConfiguration) any, (Credential) any, (File) any, logger); times = 0;
+            JibServiceUtil.jibPush((ImageConfiguration) any, (Credential) any, (File) any, false, logger); times = 0;
         }};
         // @formatter:on
     }
@@ -164,6 +164,7 @@ public void testPushWithConfiguration(@Mocked JibServiceUtil jibServiceUtil) thr
                     imageConfiguration,
                     Credential.from("testuserpush", "testpass"),
                     (File)any,
+                    false,
                     logger);
             times = 1;
         }};

diff --git a/src/test/java/io/fabric8/maven/docker/util/JibServiceUtilTest.java b/src/test/java/io/fabric8/maven/docker/util/JibServiceUtilTest.java
@@ -103,20 +103,6 @@ public void testCopyToContainer(@Mocked JibContainerBuilder containerBuilder) th
         }};
     }
 
-    @Test
-    public void testAppendOriginalImageNameTagIfApplicable() {
-        // Given
-        List<String> imageTagList = Arrays.asList("0.0.1", "0.0.1-SNAPSHOT");
-
-        // When
-        Set<String> result = JibServiceUtil.getAllImageTags(imageTagList, "test-project");
-
-        // Then
-        assertNotNull(result);
-        assertEquals(3, result.size());
-        assertArrayEquals(new String[]{"0.0.1-SNAPSHOT", "0.0.1", "latest"}, result.toArray());
-    }
-
     @Test
     public void testGetFullImageNameWithDefaultTag() {
         assertEquals("test/test-project:latest", JibServiceUtil.getFullImageName(getSampleImageConfiguration(), null));