diff --git a/build.gradle.kts b/build.gradle.kts index 4d8c408..0a48a38 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -23,7 +23,7 @@ plugins { // project plugins `java-gradle-plugin` groovy - kotlin("jvm") version "1.5.21" + kotlin("jvm") version "1.6.21" // test coverage jacoco diff --git a/src/main/kotlin/com/intershop/gradle/icm/docker/utils/appserver/AbstractServerTaskPreparer.kt b/src/main/kotlin/com/intershop/gradle/icm/docker/utils/appserver/AbstractServerTaskPreparer.kt index cb1e010..a4b2cb7 100644 --- a/src/main/kotlin/com/intershop/gradle/icm/docker/utils/appserver/AbstractServerTaskPreparer.kt +++ b/src/main/kotlin/com/intershop/gradle/icm/docker/utils/appserver/AbstractServerTaskPreparer.kt @@ -51,11 +51,13 @@ abstract class AbstractServerTaskPreparer( task.targetImageId(project.provider { pullTask.get().image.get() }) task.image.set(pullTask.get().image) - task.hostConfig.binds.set(getServerVolumes(task, customization).apply { - project.logger.info( - "Using the following volume binds for container startup in task {}: {}", - task.name, this - ) + task.hostConfig.binds.set(project.provider { + getServerVolumes(task, customization).apply { + project.logger.info( + "Using the following volume binds for container startup in task {}: {}", + task.name, this + ) + } }) task.withPortMappings(*getPortMappings().toTypedArray()) diff --git a/src/main/kotlin/com/intershop/gradle/icm/docker/utils/nginx/TaskPreparer.kt b/src/main/kotlin/com/intershop/gradle/icm/docker/utils/nginx/TaskPreparer.kt index fbfc7c9..9babc60 100644 --- a/src/main/kotlin/com/intershop/gradle/icm/docker/utils/nginx/TaskPreparer.kt +++ b/src/main/kotlin/com/intershop/gradle/icm/docker/utils/nginx/TaskPreparer.kt @@ -17,19 +17,13 @@ package com.intershop.gradle.icm.docker.utils.nginx import com.intershop.gradle.icm.docker.tasks.PrepareNetwork -import com.intershop.gradle.icm.docker.tasks.StartExtraContainer import com.intershop.gradle.icm.docker.utils.AbstractTaskPreparer -import com.intershop.gradle.icm.docker.utils.Configuration -import com.intershop.gradle.icm.docker.utils.ContainerUtils import com.intershop.gradle.icm.docker.utils.webserver.WATaskPreparer -import org.gradle.api.GradleException import org.gradle.api.Project import org.gradle.api.provider.Provider -import java.io.File class TaskPreparer(project: Project, - networkTask: Provider, - waTaskPreparer: WATaskPreparer, + networkTask: Provider ) : AbstractTaskPreparer(project, networkTask){ companion object {