Merge pull request #23 from mrashisha/master

Fixes #11: Updated removeImages to support local
avast · Jun 5, 2016 · 84ec061 · 84ec061
2 parents c870300 + 09e0946
commit 84ec061
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -56,3 +56,8 @@ com_crashlytics_export_strings.xml
 crashlytics.properties
 crashlytics-build.properties
 
+# Eclipse
+.settings/
+.classpath
+.project
+/bin/
diff --git a/README.md b/README.md
@@ -40,7 +40,7 @@ dockerCompose {
     // useComposeFiles = ['docker-compose.yml', 'docker-compose.prod.yml'] // like 'docker-compose -f <file>'
     // stopContainers = false                                              // useful for debugging
     // removeContainers = false
-    // removeImages = true
+    // removeImages = "None" // Other accepted values are: "All" and "Local"
     // removeVolumes = false
 }
 

diff --git a/src/main/groovy/com/avast/gradle/dockercompose/ComposeExtension.groovy b/src/main/groovy/com/avast/gradle/dockercompose/ComposeExtension.groovy
@@ -23,7 +23,7 @@ class ComposeExtension {
 
     boolean stopContainers = true
     boolean removeContainers = true
-    boolean removeImages = false
+    RemoveImages removeImages = RemoveImages.None
     boolean removeVolumes = true
 
     ComposeExtension(Project project, ComposeUp upTask, ComposeDown downTask) {
@@ -72,3 +72,9 @@ class ComposeExtension {
         res
     }
 }
+
+enum RemoveImages {
+    None,
+    Local, // images that don't have a custom name set by the `image` field
+    All
+}
diff --git a/src/main/groovy/com/avast/gradle/dockercompose/tasks/ComposeDown.groovy b/src/main/groovy/com/avast/gradle/dockercompose/tasks/ComposeDown.groovy
@@ -1,6 +1,7 @@
 package com.avast.gradle.dockercompose.tasks
 
 import com.avast.gradle.dockercompose.ComposeExtension
+import com.avast.gradle.dockercompose.RemoveImages
 import org.gradle.api.DefaultTask
 import org.gradle.api.tasks.TaskAction
 import org.gradle.process.ExecSpec
@@ -23,8 +24,13 @@ class ComposeDown extends DefaultTask {
             if (extension.removeContainers) {
                 if (getDockerComposeVersion() >= VersionNumber.parse('1.6.0')) {
                     String[] args = ['down']
-                    if(extension.removeImages) {
-                        args += ['--rmi', 'all']
+                    switch (extension.removeImages) {
+                        case RemoveImages.All:
+                        case RemoveImages.Local:
+                            args += ['--rmi', "${extension.removeImages}".toLowerCase()]
+                            break
+                        default:
+                            break
                     }
                     if(extension.removeVolumes) {
                         args += ['--volumes']