Skip to content

Commit

Permalink
Update to use the latest docker compose plugin / fix issues with chan…
Browse files Browse the repository at this point in the history
…ges to project name requirements.
  • Loading branch information
nigelgbanks committed Aug 3, 2022
1 parent 02affd0 commit 9b95610
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 7 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
```

Expand Down
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "0.9"
version = "0.11"
group = "com.github.nigelgbanks"

plugins {
Expand Down Expand Up @@ -56,7 +56,7 @@ pluginBundle {
mavenCoordinates {
groupId = "com.github.nigelgbanks"
artifactId = "isle-docker-plugins"
version = "0.9"
version = "0.11"
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
11 changes: 10 additions & 1 deletion src/main/kotlin/tasks/DockerCompose.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 9b95610

Please sign in to comment.