Upgraded Docker Compose Gradle plugin to support homebrew installation …

…eventuate-tram/eventuate-development#1
eventuate-foundation · Jul 3, 2023 · dfae8b1 · dfae8b1
1 parent 8d56a13
commit dfae8b1
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 22 deletions.
diff --git a/build.gradle b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
     }
     dependencies {
         classpath("org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion")
-        classpath "com.avast.gradle:gradle-docker-compose-plugin:0.12.0"
+        classpath "com.avast.gradle:gradle-docker-compose-plugin:$dockerComposePluginVersion"
         classpath "io.eventuate.plugins.gradle:eventuate-plugins-gradle-publish:$eventuatePluginsGradleVersion"
     }
 }
@@ -114,113 +114,113 @@ dockerCompose {
     mysql {
         projectName = null
         useComposeFiles = ["docker-compose-mysql.yml"]
-        removeContainers = project.ext.removeContainers
+        removeContainers = project.ext.removeContainers.toBoolean()
     }
 
     mysql8 {
         projectName = null
         useComposeFiles = ["docker-compose-mysql8.yml"]
-        removeContainers = project.ext.removeContainers
+        removeContainers = project.ext.removeContainers.toBoolean()
     }
 
     mysql8cdcpolling {
         projectName = null
         useComposeFiles = ["docker-compose-mysql8.yml", "docker-compose-cdc-mysql-polling.yml"]
-        removeContainers = project.ext.removeContainers
+        removeContainers = project.ext.removeContainers.toBoolean()
         startedServices = ["eventuate-cdc-service"]
     }
 
     mysql8cdcunifiedpolling {
         environment.put "EVENTUATE_OUTBOX_TABLES", "8"
         projectName = null
         useComposeFiles = ["docker-compose-mysql8.yml", "docker-compose-cdc-unified-polling-mysql.yml"]
-        removeContainers = project.ext.removeContainers
+        removeContainers = project.ext.removeContainers.toBoolean()
         startedServices = ["eventuate-cdc-service"]
     }
 
     mysqlonly {
         projectName = null
         useComposeFiles = ["docker-compose-mysql.yml"]
-        removeContainers = project.ext.removeContainers
+        removeContainers = project.ext.removeContainers.toBoolean()
         startedServices = ["mysql"]
         removeOrphans = false
     }
 
     mysql8only {
         projectName = null
         useComposeFiles = ["docker-compose-mysql8.yml"]
-        removeContainers = project.ext.removeContainers
+        removeContainers = project.ext.removeContainers.toBoolean()
         startedServices = ["mysql"]
         removeOrphans = false
     }
 
     mysql8KafkaOnly {
         projectName = null
         useComposeFiles = ["docker-compose-mysql8.yml"]
-        removeContainers = project.ext.removeContainers
+        removeContainers = project.ext.removeContainers.toBoolean()
         startedServices = ["kafka"]
         removeOrphans = false
     }
 
     mysqlmigration {
         projectName = null
-        removeContainers = project.ext.removeContainers
+        removeContainers = project.ext.removeContainers.toBoolean()
         useComposeFiles = ["docker-compose-eventuate-local-mysql-for-migration.yml"]
         startedServices = project.ext.composeStartedServices()
     }
 
     mariadb {
         projectName = null
         useComposeFiles = ["docker-compose-mariadb.yml"]
-        removeContainers = project.ext.removeContainers
+        removeContainers = project.ext.removeContainers.toBoolean()
     }
 
     mariadbonly {
         projectName = null
         useComposeFiles = ["docker-compose-mariadb.yml"]
-        removeContainers = project.ext.removeContainers
+        removeContainers = project.ext.removeContainers.toBoolean()
         startedServices = ["mariadb"]
         removeOrphans = false
     }
 
     mssql {
         projectName = null
         useComposeFiles = ["docker-compose-mssql.yml"]
-        removeContainers = project.ext.removeContainers
+        removeContainers = project.ext.removeContainers.toBoolean()
     }
 
     mssqlonly {
         projectName = null
         useComposeFiles = ["docker-compose-mssql.yml"]
-        removeContainers = project.ext.removeContainers
+        removeContainers = project.ext.removeContainers.toBoolean()
         startedServices = ["mssql"]
         removeOrphans = false
     }
 
     postgres {
         projectName = null
         useComposeFiles = ["docker-compose-postgres.yml"]
-        removeContainers = project.ext.removeContainers
+        removeContainers = project.ext.removeContainers.toBoolean()
     }
 
     postgresonly {
         projectName = null
         useComposeFiles = ["docker-compose-postgres.yml"]
-        removeContainers = project.ext.removeContainers
+        removeContainers = project.ext.removeContainers.toBoolean()
         startedServices = ["postgres"]
         removeOrphans = false
     }
 
     unified {
         projectName = null
         useComposeFiles = ["docker-compose-unified.yml", "docker-compose-cdc-unified.yml"]
-        removeContainers = project.ext.removeContainers
+        removeContainers = project.ext.removeContainers.toBoolean()
     }
 
     publish {
         projectName = null
         useComposeFiles = ["docker-compose-mysql.yml", "docker-compose-cdc-mysql-binlog.yml"]
-        removeContainers = project.ext.removeContainers
+        removeContainers = project.ext.removeContainers.toBoolean()
     }
 }
 

diff --git a/eventuate-local-java-cdc-connector-e2e-tests/build.gradle b/eventuate-local-java-cdc-connector-e2e-tests/build.gradle
@@ -26,7 +26,7 @@ dockerCompose {
 
     eventuatelocalcdc {
         projectName = null
-        removeContainers = project.ext.removeContainers
+        removeContainers = project.ext.removeContainers.toBoolean()
         upAdditionalArgs = ['--no-deps']
         useComposeFiles = ["../${databaseDockerFile}", "../${databaseDockerCdcFile}"]
         if (mode != "unified") {

diff --git a/eventuate-tram-cdc-connector-activemq-e2e-tests/build.gradle b/eventuate-tram-cdc-connector-activemq-e2e-tests/build.gradle
@@ -23,7 +23,7 @@ dockerCompose {
 
     tramcdc {
         projectName = null
-        removeContainers = project.ext.removeContainers
+        removeContainers = project.ext.removeContainers.toBoolean()
         upAdditionalArgs = ['--no-deps']
         useComposeFiles = ["../${databaseDockerFile}", "../${databaseDockerCdcFile}"]
         startedServices = ["zookeeper", "activemq", database, "eventuate-cdc-service"]

diff --git a/eventuate-tram-cdc-connector-kafka-e2e-tests/build.gradle b/eventuate-tram-cdc-connector-kafka-e2e-tests/build.gradle
@@ -25,7 +25,7 @@ dockerCompose {
 
     tramcdc {
         projectName = null
-        removeContainers = project.ext.removeContainers
+        removeContainers = project.ext.removeContainers.toBoolean()
         upAdditionalArgs = ['--no-deps']
         useComposeFiles = ["../${databaseDockerFile}", "../${databaseDockerCdcFile}"]
         if (mode != "unified") {

diff --git a/eventuate-tram-cdc-connector-rabbitmq-e2e-tests/build.gradle b/eventuate-tram-cdc-connector-rabbitmq-e2e-tests/build.gradle
@@ -23,7 +23,7 @@ dockerCompose {
 
     tramcdc {
         projectName = null
-        removeContainers = project.ext.removeContainers
+        removeContainers = project.ext.removeContainers.toBoolean()
         upAdditionalArgs = ['--no-deps']
         useComposeFiles = ["../${databaseDockerFile}", "../${databaseDockerCdcFile}"]
         startedServices = ["rabbitmq", "zookeeper", database, "eventuate-cdc-service"]

diff --git a/eventuate-tram-cdc-connector-redis-e2e-tests/build.gradle b/eventuate-tram-cdc-connector-redis-e2e-tests/build.gradle
@@ -23,7 +23,7 @@ dockerCompose {
 
     tramcdc {
         projectName = null
-        removeContainers = project.ext.removeContainers
+        removeContainers = project.ext.removeContainers.toBoolean()
         upAdditionalArgs = ['--no-deps']
         useComposeFiles = ["../${databaseDockerFile}", "../${databaseDockerCdcFile}"]
         startedServices = ["zookeeper", "redis", database, "eventuate-cdc-service"]

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,6 @@
 deployUrl=file:///Users/cer/.m2/testdeploy
 eventuateMavenRepoUrl=file:///Users/cer/.m2/testdeploy,https://snapshots.repositories.eventuate.io/repository
+dockerComposePluginVersion=0.16.12
 
 dockerImageTag=latest