Skip to content

Commit 1695cb7

Browse files
committed
feat: build services usage registered using Task.usesService() method
1 parent d411339 commit 1695cb7

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ You could easily ensure that `docker compose up` is called before your tests but
5858
# Usage
5959
The plugin must be applied on project that contains `docker-compose.yml` file. It supposes that [Docker Engine](https://docs.docker.com/engine/) and [Docker Compose](https://docs.docker.com/compose/) are installed and available in `PATH`.
6060

61+
> Starting from plugin version _0.17.6_, Gradle 6.1 is required, because _Task.usesService()_ is used.
62+
6163
> Starting from plugin version _0.17.0_, _useDockerComposeV2_ property defaults to _true_, so the new `docker compose` (instead of deprecated `docker-compose` is used).
6264
6365
> Starting from plugin version _0.10.0_, Gradle 4.9 or newer is required (because it uses [Task Configuration Avoidance API](https://docs.gradle.org/current/userguide/task_configuration_avoidance.html)).

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,14 @@ class TasksConfigurator {
6767
})
6868
task.dockerExecutor = composeSettings.dockerExecutor
6969
task.finalizedBy(downForcedOnFailureTask)
70+
task.usesService(composeExecutor)
71+
task.usesService(serviceInfoCache)
7072
}
7173
this.buildTask = project.tasks.register(name ? "${name}ComposeBuild".toString() : 'composeBuild', ComposeBuild) {task ->
7274
task.buildAdditionalArgs.set(composeSettings.buildAdditionalArgs)
7375
task.startedServices.set(composeSettings.startedServices)
7476
task.composeExecutor.set(composeExecutor)
77+
task.usesService(composeExecutor)
7578
}
7679
this.pullTask = project.tasks.register(name ? "${name}ComposePull".toString() : 'composePull', ComposePull) {task ->
7780
task.ignorePullFailure.set(composeSettings.ignorePullFailure)
@@ -81,15 +84,18 @@ class TasksConfigurator {
8184
task.dependsOn(composeSettings.buildBeforePull.map { buildBeforePull ->
8285
buildBeforePull ? [buildTask] : []
8386
})
87+
task.usesService(composeExecutor)
8488
}
8589
this.logsTask = project.tasks.register(name ? "${name}ComposeLogs".toString() : 'composeLogs', ComposeLogs) {task ->
8690
task.containerLogToDir.set(composeSettings.containerLogToDir)
8791
task.composeExecutor.set(composeExecutor)
92+
task.usesService(composeExecutor)
8893
}
8994
this.pushTask = project.tasks.register(name ? "${name}ComposePush".toString() : 'composePush', ComposePush) {task ->
9095
task.ignorePushFailure.set(composeSettings.ignorePushFailure)
9196
task.pushServices.set(composeSettings.pushServices)
9297
task.composeExecutor.set(composeExecutor)
98+
task.usesService(composeExecutor)
9399
}
94100
}
95101

@@ -108,6 +114,8 @@ class TasksConfigurator {
108114
task.nestedName.set(composeSettings.nestedName)
109115
task.composeExecutor.set(composeExecutor)
110116
task.serviceInfoCache.set(serviceInfoCache)
117+
task.usesService(composeExecutor)
118+
task.usesService(serviceInfoCache)
111119
}
112120

113121
@PackageScope

0 commit comments

Comments
 (0)