Skip to content

Commit a7ff9d2

Browse files
committed
impl: apply extensions using conventions
1 parent 6dc0014 commit a7ff9d2

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

docker-tools/src/main/kotlin/com/wolfyscript/devtools/docker/run/DockerRunTask.kt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -64,17 +64,17 @@ abstract class DockerRunTask : DefaultTask() {
6464
}
6565

6666
fun applyExtension(extension: DockerRunExtension) {
67-
this.name.set(extension.name)
68-
this.image.set(extension.image)
69-
if (extension.network.isPresent) network.set(extension.network)
70-
if (extension.command.isPresent) command.set(extension.command)
71-
if (extension.daemonize.isPresent) daemonize.set(extension.daemonize)
72-
if (extension.clean.isPresent) clean.set(extension.clean)
73-
if (extension.ignoreExitValue.isPresent) ignoreExitValue.set(extension.ignoreExitValue)
74-
if (extension.ports.isPresent) ports.set(extension.ports)
75-
if (extension.env.isPresent) env.set(extension.env)
76-
if (extension.arguments.isPresent) arguments.set(extension.arguments)
77-
if (extension.volumes.isPresent) volumes.set(extension.volumes)
67+
name.convention(extension.name)
68+
image.convention(extension.image)
69+
network.convention(extension.network)
70+
command.convention(extension.command)
71+
daemonize.convention(extension.daemonize)
72+
clean.convention(extension.clean)
73+
ignoreExitValue.convention(extension.ignoreExitValue)
74+
ports.convention(extension.ports)
75+
env.convention(extension.env)
76+
arguments.convention(extension.arguments)
77+
volumes.convention(extension.volumes)
7878
}
7979

8080
@TaskAction

docker-tools/src/main/kotlin/com/wolfyscript/devtools/docker/run/DockerStopTask.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ abstract class DockerStopTask: DefaultTask() {
1515
val ignoreExitValue: Property<Boolean> = project.objects.property<Boolean>().convention(true)
1616

1717
fun applyExtension(extension: DockerRunExtension) {
18-
this.name.set(extension.name)
19-
if (extension.ignoreExitValue.isPresent) ignoreExitValue.set(extension.ignoreExitValue)
18+
name.convention(extension.name)
19+
ignoreExitValue.convention(extension.ignoreExitValue)
2020
}
2121

2222
@TaskAction

0 commit comments

Comments
 (0)