Remove dockerSetup task. (#56)

palantir · Jun 21, 2016 · 38c5242 · 38c5242
1 parent 04c6c89
commit 38c5242
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 80 deletions.
diff --git a/src/main/groovy/com/palantir/gradle/docker/DockerRunPlugin.groovy b/src/main/groovy/com/palantir/gradle/docker/DockerRunPlugin.groovy
@@ -18,7 +18,6 @@ package com.palantir.gradle.docker
 import com.google.common.collect.Lists
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.api.Task
 import org.gradle.api.tasks.Exec
 import org.gradle.logging.StyledTextOutput
 import org.gradle.logging.StyledTextOutputFactory
@@ -32,32 +31,26 @@ class DockerRunPlugin implements Plugin<Project> {
     void apply(Project project) {
         DockerRunExtension ext = project.extensions.create('dockerRun', DockerRunExtension)
 
-        Task setup = DockerSetupTask.getOrInstall(project)
-
         Exec dockerRunStatus = project.tasks.create('dockerRunStatus', Exec, {
             group = 'Docker Run'
             description = 'Checks the run status of the container'
-            dependsOn setup
         })
 
         Exec dockerRun = project.tasks.create('dockerRun', Exec, {
             group = 'Docker Run'
             description = 'Runs the specified container with port mappings'
-            dependsOn setup
         })
 
         Exec dockerStop = project.tasks.create('dockerStop', Exec, {
             group = 'Docker Run'
             description = 'Stops the named container if it is running'
             ignoreExitValue = true
-            dependsOn setup
         })
 
         Exec dockerRemoveContainer = project.tasks.create('dockerRemoveContainer', Exec, {
             group = 'Docker Run'
             description = 'Removes the persistent container associated with the Docker Run tasks'
             ignoreExitValue = true
-            dependsOn setup
         })
 
         project.afterEvaluate {

diff --git a/src/main/groovy/com/palantir/gradle/docker/DockerSetupTask.groovy b/src/main/groovy/com/palantir/gradle/docker/DockerSetupTask.groovy
diff --git a/src/main/groovy/com/palantir/gradle/docker/PalantirDockerPlugin.groovy b/src/main/groovy/com/palantir/gradle/docker/PalantirDockerPlugin.groovy
@@ -34,8 +34,6 @@ class PalantirDockerPlugin implements Plugin<Project> {
             project.configurations.create('docker')
         }
 
-        Task setup = DockerSetupTask.getOrInstall(project)
-
         Delete clean = project.tasks.create('dockerClean', Delete, {
             group = 'Docker'
             description = 'Cleans Docker build directory.'
@@ -50,7 +48,7 @@ class PalantirDockerPlugin implements Plugin<Project> {
         Exec exec = project.tasks.create('docker', Exec, {
             group = 'Docker'
             description = 'Builds Docker image.'
-            dependsOn prepare, setup
+            dependsOn prepare
         })
 
         Exec push = project.tasks.create('dockerPush', Exec, {