From a3f1e0ea0743362868e4adc17d6c975eb66368bc Mon Sep 17 00:00:00 2001 From: Chris Richardson Date: Wed, 23 Aug 2023 10:11:28 +0900 Subject: [PATCH] Revert "Upgraded Docker Compose Gradle plugin to support homebrew installation https://github.com/eventuate-tram/eventuate-development/issues/1" This reverts commit dfae8b14d9fc833d0041089d53748f4aeaa69497. --- build.gradle | 34 +++++++++---------- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- gradle.properties | 1 - 7 files changed, 22 insertions(+), 23 deletions(-) diff --git a/build.gradle b/build.gradle index f57efbf9..3d9d1408 100644 --- 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:$dockerComposePluginVersion" + classpath "com.avast.gradle:gradle-docker-compose-plugin:0.12.0" classpath "io.eventuate.plugins.gradle:eventuate-plugins-gradle-publish:$eventuatePluginsGradleVersion" } } @@ -114,19 +114,19 @@ dockerCompose { mysql { projectName = null useComposeFiles = ["docker-compose-mysql.yml"] - removeContainers = project.ext.removeContainers.toBoolean() + removeContainers = project.ext.removeContainers } mysql8 { projectName = null useComposeFiles = ["docker-compose-mysql8.yml"] - removeContainers = project.ext.removeContainers.toBoolean() + removeContainers = project.ext.removeContainers } mysql8cdcpolling { projectName = null useComposeFiles = ["docker-compose-mysql8.yml", "docker-compose-cdc-mysql-polling.yml"] - removeContainers = project.ext.removeContainers.toBoolean() + removeContainers = project.ext.removeContainers startedServices = ["eventuate-cdc-service"] } @@ -134,14 +134,14 @@ dockerCompose { environment.put "EVENTUATE_OUTBOX_TABLES", "8" projectName = null useComposeFiles = ["docker-compose-mysql8.yml", "docker-compose-cdc-unified-polling-mysql.yml"] - removeContainers = project.ext.removeContainers.toBoolean() + removeContainers = project.ext.removeContainers startedServices = ["eventuate-cdc-service"] } mysqlonly { projectName = null useComposeFiles = ["docker-compose-mysql.yml"] - removeContainers = project.ext.removeContainers.toBoolean() + removeContainers = project.ext.removeContainers startedServices = ["mysql"] removeOrphans = false } @@ -149,7 +149,7 @@ dockerCompose { mysql8only { projectName = null useComposeFiles = ["docker-compose-mysql8.yml"] - removeContainers = project.ext.removeContainers.toBoolean() + removeContainers = project.ext.removeContainers startedServices = ["mysql"] removeOrphans = false } @@ -157,14 +157,14 @@ dockerCompose { mysql8KafkaOnly { projectName = null useComposeFiles = ["docker-compose-mysql8.yml"] - removeContainers = project.ext.removeContainers.toBoolean() + removeContainers = project.ext.removeContainers startedServices = ["kafka"] removeOrphans = false } mysqlmigration { projectName = null - removeContainers = project.ext.removeContainers.toBoolean() + removeContainers = project.ext.removeContainers useComposeFiles = ["docker-compose-eventuate-local-mysql-for-migration.yml"] startedServices = project.ext.composeStartedServices() } @@ -172,13 +172,13 @@ dockerCompose { mariadb { projectName = null useComposeFiles = ["docker-compose-mariadb.yml"] - removeContainers = project.ext.removeContainers.toBoolean() + removeContainers = project.ext.removeContainers } mariadbonly { projectName = null useComposeFiles = ["docker-compose-mariadb.yml"] - removeContainers = project.ext.removeContainers.toBoolean() + removeContainers = project.ext.removeContainers startedServices = ["mariadb"] removeOrphans = false } @@ -186,13 +186,13 @@ dockerCompose { mssql { projectName = null useComposeFiles = ["docker-compose-mssql.yml"] - removeContainers = project.ext.removeContainers.toBoolean() + removeContainers = project.ext.removeContainers } mssqlonly { projectName = null useComposeFiles = ["docker-compose-mssql.yml"] - removeContainers = project.ext.removeContainers.toBoolean() + removeContainers = project.ext.removeContainers startedServices = ["mssql"] removeOrphans = false } @@ -200,13 +200,13 @@ dockerCompose { postgres { projectName = null useComposeFiles = ["docker-compose-postgres.yml"] - removeContainers = project.ext.removeContainers.toBoolean() + removeContainers = project.ext.removeContainers } postgresonly { projectName = null useComposeFiles = ["docker-compose-postgres.yml"] - removeContainers = project.ext.removeContainers.toBoolean() + removeContainers = project.ext.removeContainers startedServices = ["postgres"] removeOrphans = false } @@ -214,13 +214,13 @@ dockerCompose { unified { projectName = null useComposeFiles = ["docker-compose-unified.yml", "docker-compose-cdc-unified.yml"] - removeContainers = project.ext.removeContainers.toBoolean() + removeContainers = project.ext.removeContainers } publish { projectName = null useComposeFiles = ["docker-compose-mysql.yml", "docker-compose-cdc-mysql-binlog.yml"] - removeContainers = project.ext.removeContainers.toBoolean() + removeContainers = project.ext.removeContainers } } diff --git a/eventuate-local-java-cdc-connector-e2e-tests/build.gradle b/eventuate-local-java-cdc-connector-e2e-tests/build.gradle index 8bcb505c..a673f616 100644 --- 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.toBoolean() + removeContainers = project.ext.removeContainers 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 index 6038c438..707fc30b 100644 --- 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.toBoolean() + removeContainers = project.ext.removeContainers 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 index 9364a0c5..4905eb98 100644 --- 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.toBoolean() + removeContainers = project.ext.removeContainers 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 index 7d49c9e2..0e3bbb3b 100644 --- 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.toBoolean() + removeContainers = project.ext.removeContainers 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 index 37d7859f..0dcdac9c 100644 --- 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.toBoolean() + removeContainers = project.ext.removeContainers upAdditionalArgs = ['--no-deps'] useComposeFiles = ["../${databaseDockerFile}", "../${databaseDockerCdcFile}"] startedServices = ["zookeeper", "redis", database, "eventuate-cdc-service"] diff --git a/gradle.properties b/gradle.properties index 662a63af..ee2d65c5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,5 @@ deployUrl=file:///Users/cer/.m2/testdeploy eventuateMavenRepoUrl=file:///Users/cer/.m2/testdeploy,https://snapshots.repositories.eventuate.io/repository -dockerComposePluginVersion=0.16.12 dockerImageTag=latest