Skip to content

Commit

Permalink
Upgrade avast docker compose plugin to 0.17.4 and compose v2
Browse files Browse the repository at this point in the history
  • Loading branch information
joffrey-bion committed Aug 9, 2023
1 parent 7318109 commit cfe940a
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ jobs:

# Docker is not installed on GitHub's MacOS hosted workers due to licensing issues
# (and it's necessary to run Autobahn tests)
- name: Setup docker and docker-compose (missing on MacOS)
- name: Setup docker (missing on MacOS)
if: runner.os == 'macos'
run: |
brew install docker docker-compose
brew install docker
# Using mount-type 9p to allow the containers launched via docker-compose to chown
# https://github.com/abiosoft/colima/issues/54#issuecomment-1250217077
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ jobs:

# Docker is not installed on GitHub's MacOS hosted workers due to licensing issues
# (and it's necessary to run Autobahn tests)
- name: Setup docker and docker-compose (missing on MacOS)
- name: Setup docker (missing on MacOS)
if: runner.os == 'macos'
run: |
brew install docker docker-compose
brew install docker
# Using mount-type 9p to allow the containers launched via docker-compose to chown
# https://github.com/abiosoft/colima/issues/54#issuecomment-1250217077
Expand Down
3 changes: 0 additions & 3 deletions autobahn-tests/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit cfe940a

Please sign in to comment.