diff --git a/README.md b/README.md index b055f93..a231c4a 100644 --- a/README.md +++ b/README.md @@ -124,11 +124,11 @@ Alternatively you can rely on the Github actions which will publish when a relea ## Using the Plugin -To include this plugin for versions 0.9+ add the following to your `build.gradle.kts` file: +To include this plugin for versions 0.11+ add the following to your `build.gradle.kts` file: ```kotlin plugins { - id("com.github.nigelgbanks.IsleDocker") version "0.9" + id("com.github.nigelgbanks.IsleDocker") version "0.11" } ``` diff --git a/build.gradle.kts b/build.gradle.kts index ce8cac7..21297cb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,4 +1,4 @@ -version = "0.9" +version = "0.11" group = "com.github.nigelgbanks" plugins { @@ -56,7 +56,7 @@ pluginBundle { mavenCoordinates { groupId = "com.github.nigelgbanks" artifactId = "isle-docker-plugins" - version = "0.9" + version = "0.11" } } diff --git a/gradle.properties b/gradle.properties index ed618fc..a851d49 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ # suppress inspection "UnusedProperty" for whole file org.gradle.parallel=true org.gradle.caching=true -version=0.0.9-SNAPSHOT +version=0.11-SNAPSHOT diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2e6e589..8049c68 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/kotlin/tasks/DockerCompose.kt b/src/main/kotlin/tasks/DockerCompose.kt index 90fdccb..e0c2d8a 100644 --- a/src/main/kotlin/tasks/DockerCompose.kt +++ b/src/main/kotlin/tasks/DockerCompose.kt @@ -137,7 +137,16 @@ abstract class DockerCompose : DockerClient() { isIgnoreExitValue = ignoreExitValue if (output != null) standardOutput = output if (error != null) errorOutput = error - commandLine("docker-compose", "--project-name", project.path.replace(":", "_"), *args) + commandLine( + "docker", + "compose", + "--project-name", + project.path + .replace(":", "_") + .toLowerCase() + .removePrefix("_"), + *args + ) } fun up(vararg args: String, ignoreExitValue: Boolean = false) = try {