#348 : Add documentation and update changelog

fabric8io · Jan 19, 2016 · cee9790 · cee9790
1 parent 54fc47d
commit cee9790
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/doc/changelog.md b/doc/changelog.md
@@ -1,5 +1,8 @@
 # ChangeLog
 
+* **0.13.8**
+  - Add option `nocache` for building images (#348)
+
 * **0.13.7**
   - Fix default for "cleanup" in build configuration to `true` (as documented) ([#338](https://github.com/rhuss/docker-maven-plugin/issues/338))
   - Fix dynamic host property update in port mapping ([#323](https://github.com/rhuss/docker-maven-plugin/issues/323))  

diff --git a/doc/manual/docker-build.md b/doc/manual/docker-build.md
@@ -9,8 +9,9 @@ of an image configuration. The available subelements are
 
 * **assembly** specifies the assembly configuration as described in
   [Build Assembly](#build-assembly)
-* **cleanup** indicates if dangling (untagged) images should be cleaned up after each build (including any containers
-  created from them). Default is `true`   
+* **cleanup** Cleanup dangling (untagged) images after each build (including any containers
+  created from them). Default is `true`
+* **nocache** Don't use Docker's build cache
 * **cmd** A command to execute by default (i.e. if no command
   is provided when a container for this image is started). See 
   [Start-up Arguments](#start-up-arguments) for details.

diff --git a/doc/manual/external-configuration.md b/doc/manual/external-configuration.md
@@ -52,6 +52,13 @@ values in the `<build>` and `<run>` sections.
   when creating the assembly archive
 * **docker.assembly.dockerFileDir** specifies a directory containing an external Dockerfile
   that will be used to create the image
+* **docker.cleanup** Cleanup dangling (untagged) images after each build (including 
+any containers
+  created from them). Default is `true`
+* **docker.nocache** Don't use Docker's build cache
+* **docker.optimise** if set to true then it will compress all the `runCmds` into a single RUN directive so that only 
+one image layer is created.
+
 * **docker.bind.idx** Sets a list of paths to bind/expose in the container
 * **docker.capAdd.idx** List of kernel capabilities to add to the container
 * **docker.capDrop.idx** List of kernel capabilities to remove from the container

diff --git a/src/main/java/org/jolokia/docker/maven/config/handler/property/ConfigKey.java b/src/main/java/org/jolokia/docker/maven/config/handler/property/ConfigKey.java
@@ -36,6 +36,7 @@ public enum ConfigKey {
     CAP_ADD,
     CAP_DROP,
     CLEANUP,
+    NOCACHE,
     OPTIMISE,
     CMD,
     DOMAINNAME,
@@ -53,7 +54,6 @@ public enum ConfigKey {
     MEMORY_SWAP,
     NAME,
     NAMING_STRATEGY,
-    NOCACHE,
     PORT_PROPERTY_FILE,
     PORTS,
     RUN,