Skip to content

Commit e893565

Browse files
committed
fix: task registering fixed
1 parent baddaa5 commit e893565

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

src/main/groovy/com/avast/gradle/dockercompose/TasksConfigurator.groovy

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,18 @@ class TasksConfigurator {
2828
this.project = project
2929
Provider<ComposeExecutor> composeExecutor = ComposeExecutor.getInstance(project, composeSettings)
3030
Provider<ServiceInfoCache> serviceInfoCache = ServiceInfoCache.getInstance(project, composeSettings.nestedName)
31+
this.downTask = project.tasks.register(name ? "${name}ComposeDown".toString() : 'composeDown', ComposeDown) {task ->
32+
configureDownForcedTask(task, composeExecutor, serviceInfoCache)
33+
task.stopContainers.set(composeSettings.stopContainers)
34+
}
35+
this.downForcedTask = project.tasks.register(name ? "${name}ComposeDownForced".toString() : 'composeDownForced', ComposeDownForced) {task ->
36+
configureDownForcedTask(task, composeExecutor, serviceInfoCache)
37+
}
38+
def downForcedOnFailureTask = project.tasks.register(name ? "${name}ComposeDownForcedOnFailure".toString() : 'composeDownForcedOnFailure', ComposeDownForced) {task ->
39+
configureDownForcedTask(task, composeExecutor, serviceInfoCache)
40+
task.onlyIf { task.serviceInfoCache.get().startupFailed }
41+
}
42+
this.downForcedOnFailureTask = downForcedOnFailureTask
3143
this.upTask = project.tasks.register(name ? "${name}ComposeUp".toString() : 'composeUp', ComposeUp) {task ->
3244
task.stopContainers.set(composeSettings.stopContainers)
3345
task.forceRecreate.set(composeSettings.forceRecreate)
@@ -70,17 +82,6 @@ class TasksConfigurator {
7082
buildBeforePull ? [buildTask] : []
7183
})
7284
}
73-
this.downTask = project.tasks.register(name ? "${name}ComposeDown".toString() : 'composeDown', ComposeDown) {task ->
74-
configureDownForcedTask(task, composeExecutor, serviceInfoCache)
75-
task.stopContainers.set(composeSettings.stopContainers)
76-
}
77-
this.downForcedTask = project.tasks.register(name ? "${name}ComposeDownForced".toString() : 'composeDownForced', ComposeDownForced) {task ->
78-
configureDownForcedTask(task, composeExecutor, serviceInfoCache)
79-
}
80-
this.downForcedOnFailureTask = project.tasks.register(name ? "${name}ComposeDownForcedOnFailure".toString() : 'composeDownForcedOnFailure', ComposeDownForced) {task ->
81-
configureDownForcedTask(task, composeExecutor, serviceInfoCache)
82-
task.onlyIf { task.serviceInfoCache.get().startupFailed }
83-
}
8485
this.logsTask = project.tasks.register(name ? "${name}ComposeLogs".toString() : 'composeLogs', ComposeLogs) {task ->
8586
task.containerLogToDir.set(composeSettings.containerLogToDir)
8687
task.composeExecutor.set(composeExecutor)

0 commit comments

Comments
 (0)