Upgrade avast docker compose plugin to 0.17.4 and compose v2

joffrey-bion · Aug 9, 2023 · cb162df · cb162df
1 parent 7318109
commit cb162df
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -32,7 +32,16 @@ jobs:
       - name: Setup docker and docker-compose (missing on MacOS)
         if: runner.os == 'macos'
         run: |
-          brew install docker docker-compose
+          brew install docker
+          
+          docker -v
+          docker compose --help
+          
+          brew install docker-compose
+          
+          # Link the Docker Compose v2 plugin so it's understood by the docker CLI
+          mkdir -p ~/.docker/cli-plugins
+          ln -sfn $HOMEBREW_PREFIX/opt/docker-compose/bin/docker-compose ~/.docker/cli-plugins/docker-compose
           
           # Using mount-type 9p to allow the containers launched via docker-compose to chown
           # https://github.com/abiosoft/colima/issues/54#issuecomment-1250217077

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -30,6 +30,10 @@ jobs:
         run: |
           brew install docker docker-compose
           
+          # Link the Docker Compose v2 plugin so it's understood by the docker CLI
+          mkdir -p ~/.docker/cli-plugins
+          ln -sfn $HOMEBREW_PREFIX/opt/docker-compose/bin/docker-compose ~/.docker/cli-plugins/docker-compose
+          
           # Using mount-type 9p to allow the containers launched via docker-compose to chown
           # https://github.com/abiosoft/colima/issues/54#issuecomment-1250217077
           colima start --mount-type 9p

diff --git a/autobahn-tests/build.gradle.kts b/autobahn-tests/build.gradle.kts
@@ -153,9 +153,6 @@ configurations.configureEach {
 dockerCompose {
     useComposeFiles.set(listOf(file("$projectDir/test-server/docker-compose.yml").toString()))
     buildBeforeUp.set(false)
-
-    // Can't use v2 right now, see https://github.com/avast/gradle-docker-compose-plugin/issues/414
-    useDockerComposeV2.set(false)
 }
 
 // ensure autobahn test server is launched for websocket tests

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -17,7 +17,7 @@ vyarus-github-info = { id = "ru.vyarus.github-info", version.ref = "vyarus-githu
 
 [versions]
 
-avast-docker-compose-plugin = "0.17.2"
+avast-docker-compose-plugin = "0.17.4"
 binary-compatibility-validator-plugin = "0.13.2"
 complete-kotlin-plugin = "1.1.0"
 dokka = "1.8.20"