fix : Introduce pullRetries and pushRetries fields

Signed-off-by: Rohan Kumar <[email protected]>

Author: rohanKanojia

src/main/asciidoc/inc/build/_configuration.adoc

@@ -120,9 +120,6 @@ a| Scan the archive specified in `dockerArchive` and find the actual repository
 | *shell*
 | Shell to be used for the *runCmds*. It contains *arg* elements which are defining the executable and its params.
 
-| *retries*
-| If pulling an image is required, how often should a pull be retried before giving up. This useful for flaky registries which tend to return 500 error codes from time to time. The default is 0 which means no retry at all.
-
 | *runCmds*
 | Commands to be run during the build process. It contains *run* elements which are passed to the shell. Whitespace is trimmed from each element and empty elements are ignored. The run commands are inserted right after the assembly and after *workdir* into the Dockerfile. This tag is not to be confused with the `<run>` section for this image which specifies the runtime behaviour when starting containers.
 

src/main/asciidoc/inc/start/_configuration.adoc

@@ -9,7 +9,7 @@ In addition to the <<global-configuration>>, this goal supports the following gl
 | Default pattern for naming all containers when they are created. See <<container-name, Container Names>> for details.
 | `docker.containerNamePattern`
 
-| *retries*
+| *pullRetries*
 | If pulling an image is required, how often should a pull be retried before giving up. This useful for flaky registries which tend to return 500 error codes from time to time. The default is 0 which means no retry at all.
 | `docker.pull.retries`
 

src/main/asciidoc/inc/watch/_configuration.adoc

@@ -55,14 +55,14 @@ below how this can be specified.
 | `docker.keepRunning`
 
 | *keepContainer*
-| As for `{plugin}:stop`, if this is set to `true` (and `keepRunning` is disabled) then all container will be removed after they have been stopped. The default is `true`.
+| As for `{plugin}:stop`, if this is set to `true` (and `keepRunning` is disabled) then all container will be removed after they have been stopped. The default is `false`.
 | `docker.keepContainer`
 
 | *removeVolumes*
 | if set to `true` will remove any volumes associated to the container as well. This option will be ignored if either `keepContainer` or `keepRunning` are `true`.
 | `docker.removeVolumes`
 
-| *retries*
+| *pullRetries*
 | If pulling an image is required, how often should a pull be retried before giving up. This useful for flaky registries which tend to return 500 error codes from time to time. The default is 0 which means no retry at all.
 | `docker.pull.retries`
 |===

src/main/java/io/fabric8/maven/docker/AbstractDockerMojo.java

@@ -121,9 +121,15 @@ public abstract class AbstractDockerMojo extends AbstractMojo implements Context
     @Parameter(property = "docker.removeVolumes", defaultValue = "false")
     protected boolean removeVolumes;
 
-    @Parameter(property = "docker.pull.retries", defaultValue = "0")
+    @Parameter(property = "docker.retries", defaultValue = "0")
     protected int retries;
 
+    @Parameter(property = "docker.pull.retries", defaultValue = "0")
+    protected int pullRetries;
+
+    @Parameter(property = "docker.push.retries", defaultValue = "0")
+    protected int pushRetries;
+
     @Parameter(property = "docker.apiVersion")
     private String apiVersion;
 
@@ -580,7 +586,7 @@ protected void pullImage(RegistryService registryService, ImageConfiguration ima
         RunImageConfiguration runConfiguration = imageConfig.getRunConfiguration();
         ImagePullManager pullManager = getImagePullManager(determinePullPolicy(runConfiguration), autoPull);
         RegistryConfig registryConfig = getRegistryConfig(pullRegistry);
-        registryService.pullImageWithPolicy(imageName, pullManager, registryConfig, imageConfig.getBuildConfiguration(), retries);
+        registryService.pullImageWithPolicy(imageName, pullManager, registryConfig, imageConfig.getBuildConfiguration(), pullRetries);
     }
 
     protected boolean shouldSkipPom() {

src/main/java/io/fabric8/maven/docker/PushMojo.java

@@ -30,9 +30,6 @@ public class PushMojo extends AbstractDockerMojo {
      */
     @Parameter(property = "docker.skip.tag", defaultValue = "false")
     private boolean skipTag;
-    
-    @Parameter(property = "docker.push.retries", defaultValue = "0")
-    private int retries;
 
     /**
      * {@inheritDoc}

src/test/java/io/fabric8/maven/docker/access/hc/DockerAccessWithHcClientTest.java

@@ -37,6 +37,7 @@
 import static org.mockito.ArgumentMatchers.anyMap;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.isNull;
+import static org.mockito.Mockito.times;
 
 @ExtendWith(MockitoExtension.class)
 class DockerAccessWithHcClientTest {
@@ -552,7 +553,7 @@ private void givenPostCallThrowsException() throws IOException {
 
     private void thenImageWasPulled(int pushPullRetries) throws IOException {
         ArgumentCaptor<String> urlCapture = ArgumentCaptor.forClass(String.class);
-        Mockito.verify(mockDelegate)
+        Mockito.verify(mockDelegate, times(pushPullRetries))
                 .post(urlCapture.capture(), Mockito.isNull(), Mockito.anyMap(), Mockito.any(ResponseHandler.class), Mockito.eq(HTTP_OK));
 
         String postUrl = urlCapture.getValue();