Revert 'Only push the latest tag if no other tags where specified in docker mode. This can break your build, if you rely on the automatic latest tag.'

Signed-off-by: Martin Panzer <[email protected]>

Author: Postremus

doc/changelog.md

@@ -1,8 +1,9 @@
 # ChangeLog
 
 * **0.39-SNAPSHOT** :
-  - Update to jnr-unixsocket 0.38.14 to solve UnsatisfiedLinkError on Apple M1 #1257
-  - Revert "Only push the `latest` tag if no other tags where specified in jib mode. This can break your build, if you rely on the automatic `latest` tag." ([#1510](https://github.com/fabric8io/docker-maven-plugin/pull/1510))
+  - Update to jnr-unixsocket 0.38.14 to solve UnsatisfiedLinkError on Apple M1 ([#1257](https://github.com/fabric8io/docker-maven-plugin/pull/1507)) @henningn
+  - Revert "Only push the `latest` tag if no other tags where specified in jib mode. This can break your build, if you rely on the automatic `latest` tag." ([#1510](https://github.com/fabric8io/docker-maven-plugin/pull/1510)) @Postremus
+  - Revert "Only push the `latest` tag if no other tags where specified in docker mode. This can break your build, if you rely on the automatic `latest` tag." ([#1509](https://github.com/fabric8io/docker-maven-plugin/pull/1509)) @Postremus
 
 * **0.38.0** (2021-11-09):
   - Allow replacement in tags. Added a new replacement `%T` which always adds a timestamp. ([#1491](https://github.com/fabric8io/docker-maven-plugin/pull/1491))

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);
 
-                if (!skipTag && !buildConfig.getTags().isEmpty()) {
-                    for (String tag : buildConfig.getTags()) {
+                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 (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));
                 }
             }
         }

src/test/java/io/fabric8/maven/docker/service/RegistryServiceTest.java

@@ -2,12 +2,8 @@
 
 import io.fabric8.maven.docker.config.BuildImageConfiguration;
 import io.fabric8.maven.docker.config.ImageConfiguration;
-
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 import io.fabric8.maven.docker.access.AuthConfig;
@@ -18,14 +14,11 @@
 import io.fabric8.maven.docker.util.AutoPullMode;
 import io.fabric8.maven.docker.util.ImageName;
 import io.fabric8.maven.docker.util.Logger;
-import mockit.Expectations;
 import mockit.Mocked;
 import mockit.Verifications;
-import org.apache.maven.plugin.MojoExecutionException;
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
@@ -208,7 +201,7 @@ public void tagForCustomRegistry() throws DockerAccessException {
     public void pushImage() throws DockerAccessException {
         givenAnImageConfiguration("user/test:1.0.1");
 
-        whenPushImageTagSkipped();
+        whenPushImage();
 
         thenImageHasBeenPushed();
         thenNoExceptionThrown();
@@ -218,7 +211,7 @@ public void pushImage() throws DockerAccessException {
     public void pushImageWithoutBuildConfig() throws DockerAccessException {
         givenAnImageConfigurationWithoutBuildConfig("user/test:1.0.1");
 
-        whenPushImageTagSkipped();
+        whenPushImage();
 
         thenImageHasNotBeenPushed();
         thenNoExceptionThrown();
@@ -229,38 +222,12 @@ public void pushImageSkipped() throws DockerAccessException {
         givenAnImageConfiguration("user/test:1.0.1");
         givenPushSkipped(true);
 
-        whenPushImageTagSkipped();
+        whenPushImage();
 
         thenImageHasNotBeenPushed();
         thenNoExceptionThrown();
     }
 
-    @Test
-    public void testPushedImageTags() throws MojoExecutionException, DockerAccessException {
-
-        List<String> imageNames = new ArrayList<>();
-        new Expectations() {{
-            docker.pushImage(withCapture(imageNames), (AuthConfig) withNotNull(), anyString, anyInt);
-        }};
-
-
-        givenAnImageConfiguration("without-tags");
-        whenPushImageTagSkipped();
-        // latest tag is used, because no other tags are specified
-        assertEquals(imageConfiguration.getName(), imageNames.get(0));
-
-
-        givenAnImageConfigurationWithTags("with-tags");
-        whenPushImageTagSkipped(true);
-        whenPushImageTagSkipped();
-        // latest tag is used, because skipTag = true
-        assertEquals(imageConfiguration.getName(), imageNames.get(1));
-
-        // skipTag = false => both specified tags have to be pushed
-        assertEquals(imageConfiguration.getName()+":foo", imageNames.get(2));
-        assertEquals(imageConfiguration.getName()+":bar", imageNames.get(3));
-    }
-
     // ====================================================================================================
 
     private void thenNoExceptionThrown() {
@@ -329,17 +296,13 @@ private void whenAutoPullImage() {
         }
     }
 
-    private void whenPushImageTagSkipped() {
-        whenPushImageTagSkipped(false);
-    }
-
-    private void whenPushImageTagSkipped(boolean skipTag) {
+    private void whenPushImage() {
         try {
             RegistryService.RegistryConfig.Builder registryConfigBuilder =
                     new RegistryService.RegistryConfig.Builder()
                             .authConfigFactory(authConfigFactory)
                             .authConfig(authConfig);
-            registryService.pushImages(Collections.singleton(imageConfiguration), 1, registryConfigBuilder.build(), skipTag);
+            registryService.pushImages(Collections.singleton(imageConfiguration), 1, registryConfigBuilder.build(), false);
         } catch (Exception e) {
             this.actualException = e;
         }
@@ -382,11 +345,6 @@ private void givenAnImageConfiguration(String imageName) {
         imageConfiguration = new ImageConfiguration.Builder().name(imageName).buildConfig(buildImageConfiguration).build();
     }
 
-    private void givenAnImageConfigurationWithTags(String imageName) {
-        final BuildImageConfiguration buildImageConfiguration = new BuildImageConfiguration.Builder().tags(Arrays.asList("foo", "bar")).build();
-        imageConfiguration = new ImageConfiguration.Builder().name(imageName).buildConfig(buildImageConfiguration).build();
-    }
-
     private void givenAnImageConfigurationWithoutBuildConfig(String imageName) {
         imageConfiguration = new ImageConfiguration.Builder().name(imageName).buildConfig(null).build();
     }