Support autoPull on the build configuration

doc/changelog.md

@@ -2,6 +2,7 @@
 
 * **0.31-SNAPSHOT**
   - Update to jnr-unixsocket 0.23
+  - Support to autoPull in build configuration #626
   - Add null check for null instance in config.json for email #1262
   - Allow merging of image configurations using <imagesMap> ([#360](https://github.com/fabric8io/docker-maven-plugin/issues/360))
   - Treat bridged and default network mode the same #1234

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

@@ -71,6 +71,9 @@ endif::[]
 
 A provided `<from>` takes precedence over the name given here. This tag is useful for extensions of this plugin like the https://maven.fabric8.io[fabric8-maven-plugin] which can evaluate the additional information given here.
 
+| *autoPull*
+| Whether we need to pull a newer version of image.
+
 | <<build-healthcheck, *healthCheck*>>
 | Definition of a health check as described in <<build-healthcheck, Healthcheck>>
 
@@ -133,6 +136,7 @@ remote API.
 <build>
   <from>java:8u40</from>
   <maintainer>[email protected]</maintainer>
+  <autoPull>true</autoPull>
   <tags>
     <tag>latest</tag>
     <tag>${project.version}</tag>

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

@@ -13,6 +13,7 @@
 import io.fabric8.maven.docker.access.DockerAccessException;
 import io.fabric8.maven.docker.config.BuildImageConfiguration;
 import io.fabric8.maven.docker.config.ImageConfiguration;
+import io.fabric8.maven.docker.config.ImagePullPolicy;
 import io.fabric8.maven.docker.service.BuildService;
 import io.fabric8.maven.docker.service.ImagePullManager;
 import io.fabric8.maven.docker.service.ServiceHub;
@@ -83,8 +84,18 @@ protected void buildAndTag(ServiceHub hub, ImageConfiguration imageConfig)
     protected Date getReferenceDate() {
         return new Date();
     }
+
     private String determinePullPolicy(BuildImageConfiguration buildConfig) {
-        return buildConfig != null && buildConfig.getImagePullPolicy() != null ? buildConfig.getImagePullPolicy() : imagePullPolicy;
+        if (buildConfig != null) {
+            if (buildConfig.getImagePullPolicy() != null) {
+                return buildConfig.getImagePullPolicy();
+            } else if (buildConfig.getAutoPull() != null) {
+                return buildConfig.getAutoPull().equalsIgnoreCase("TRUE") ?
+                        ImagePullPolicy.IfNotPresent.name() :
+                        ImagePullPolicy.Never.name();
+            }
+        }
+        return imagePullPolicy;
     }
 
     /**

src/main/java/io/fabric8/maven/docker/access/BuildOptions.java

@@ -42,6 +42,22 @@ public BuildOptions addOption(String key, String value) {
         return this;
     }
 
+    public BuildOptions autoPull(String autoPull) {
+        if (autoPull != null) {
+            switch (autoPull.toLowerCase()) {
+                case "always":
+                case "true" :
+                case "ifnotpresent":
+                    options.put("pull", Boolean.TRUE.toString());
+                    break;
+                case "false":
+                case "never":
+                    options.put("pull", Boolean.FALSE.toString());
+            }
+        }
+        return this;
+    }
+
     public BuildOptions dockerfile(String name) {
         if (name != null) {
             options.put("dockerfile", name);

src/main/java/io/fabric8/maven/docker/config/BuildImageConfiguration.java

@@ -20,6 +20,9 @@ public class BuildImageConfiguration implements Serializable {
     public static final String DEFAULT_FILTER = "${*}";
     public static final String DEFAULT_CLEANUP = "try";
 
+    @Parameter
+    private String autoPull;
+
     /**
      * Directory is used as build context.
      * If not specified, dockerfile's parent directory is used as build context.
@@ -178,6 +181,10 @@ public boolean isDockerFileMode() {
         return dockerFileFile != null;
     }
 
+    public String getAutoPull() {
+        return autoPull;
+    }
+
     public String getLoadNamePattern() {
         return loadNamePattern;
     }
@@ -392,6 +399,11 @@ public Builder(BuildImageConfiguration that) {
             }
         }
 
+        public Builder autoPull(String autoPull) {
+            config.autoPull = autoPull;
+            return this;
+        }
+
         public Builder contextDir(String dir) {
             config.contextDir = dir;
             return this;

src/main/java/io/fabric8/maven/docker/service/BuildService.java

@@ -137,6 +137,7 @@ protected void buildImage(ImageConfiguration imageConfig, MojoParameters params,
         // auto is now supported by docker, consider switching?
         BuildOptions opts =
                 new BuildOptions(buildConfig.getBuildOptions())
+                        .autoPull(buildConfig.getAutoPull())
                         .dockerfile(getDockerfileName(buildConfig))
                         .forceRemove(cleanupMode.isRemove())
                         .noCache(noCache)

src/test/java/io/fabric8/maven/docker/access/BuildConfigTest.java

@@ -24,6 +24,7 @@
 import io.fabric8.maven.docker.util.JsonFactory;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 
 /**
  * @author roland
@@ -61,6 +62,15 @@ public void dockerfile() {
         assertEquals(0, opts.getOptions().size());
     }
 
+    @Test
+    public void autoPull() {
+        BuildOptions opts = new BuildOptions().autoPull("true");
+        assertEquals("true", opts.getOptions().get("pull"));
+
+        opts = new BuildOptions().autoPull(null);
+        assertFalse(opts.getOptions().containsKey("pull"));
+    }
+
     @Test
     public void buildArgs() {
         Map<String,String> args = Collections.singletonMap("arg1","blub");