Merge pull request #7 from dartartem/master

Removed kafka.partitions property. Updated libraries.
eventuate-tram · Apr 22, 2020 · 0d00b64 · 0d00b64
2 parents d99c18d + 9597e1d
commit 0d00b64
Show file tree

Hide file tree

Showing 11 changed files with 233 additions and 228 deletions.
diff --git a/_set-env.sh b/_set-env.sh
@@ -12,7 +12,6 @@ echo DOCKER_HOST_IP is $DOCKER_HOST_IP
 
 
 export EVENTUATELOCAL_KAFKA_BOOTSTRAP_SERVERS=$DOCKER_HOST_IP:9092
-export EVENTUATE_KAFKA_PARTITIONS=2
 export EVENTUATELOCAL_ZOOKEEPER_CONNECTION_STRING=$DOCKER_HOST_IP:2181
 export CDC_SERVICE_URL=http://$DOCKER_HOST_IP:8099
 export SPRING_DATA_MONGODB_URI=mongodb://${DOCKER_HOST_IP?}/export_test

diff --git a/docker-compose-mysql-binlog.yml b/docker-compose-mysql-binlog.yml
@@ -1,56 +1,60 @@
-zookeeper:
-  image: eventuateio/eventuateio-local-zookeeper:0.30.0.M14
-  ports:
-    - 2181:2181
-    - 2888:2888
-    - 3888:3888
+version: '3'
+services:
+  zookeeper:
+    image: confluentinc/cp-zookeeper:5.2.4
+    ports:
+      - 2181:2181
+    environment:
+      ZOOKEEPER_CLIENT_PORT: 2181
 
-kafka:
-  image: eventuateio/eventuateio-local-kafka:0.30.0.M14
-  ports:
-    - 9092:9092
-  links:
-    - zookeeper
-  environment:
-    - ADVERTISED_HOST_NAME=${DOCKER_HOST_IP}
-    - KAFKA_HEAP_OPTS=-Xmx320m -Xms320m
-    - ZOOKEEPER_SERVERS=zookeeper:2181
+  kafka:
+    image: "confluentinc/cp-enterprise-kafka:5.2.4"
+    ports:
+      - 9092:9092
+    depends_on:
+      - zookeeper
+    environment:
+      KAFKA_LISTENERS: LC://kafka:29092,LX://kafka:9092
+      KAFKA_ADVERTISED_LISTENERS: LC://kafka:29092,LX://localhost:9092
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: LC:PLAINTEXT,LX:PLAINTEXT
+      KAFKA_INTER_BROKER_LISTENER_NAME: LC
+      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
+      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
 
+  mysql:
+    image: eventuateio/eventuate-mysql:0.9.0.RELEASE
+    ports:
+      - 3306:3306
+    environment:
+      - MYSQL_ROOT_PASSWORD=rootpassword
+      - MYSQL_USER=mysqluser
+      - MYSQL_PASSWORD=mysqlpw
 
-mysql:
-  image: eventuateio/eventuate-tram-mysql:0.20.0.M10
-  ports:
-    - 3306:3306
-  environment:
-    - MYSQL_ROOT_PASSWORD=rootpassword
-    - MYSQL_USER=mysqluser
-    - MYSQL_PASSWORD=mysqlpw
+  mongodb:
+    image: mongo:3.0.4
+    hostname: mongodb
+    command: mongod --smallfiles
+    ports:
+      - "27017:27017"
 
-mongodb:
-  image: mongo:3.0.4
-  hostname: mongodb
-  command: mongod --smallfiles
-  ports:
-    - "27017:27017"
-
-cdcservice:
-  image: eventuateio/eventuate-cdc-service:local-test
-  ports:
-    - "8099:8080"
-  links:
-    - mysql
-    - kafka
-    - zookeeper
-  environment:
-    SPRING_DATASOURCE_URL: jdbc:mysql://mysql/eventuate
-    SPRING_DATASOURCE_USERNAME: mysqluser
-    SPRING_DATASOURCE_PASSWORD: mysqlpw
-    SPRING_DATASOURCE_DRIVER_CLASS_NAME: com.mysql.jdbc.Driver
-    EVENTUATELOCAL_KAFKA_BOOTSTRAP_SERVERS: kafka:29092
-    EVENTUATELOCAL_ZOOKEEPER_CONNECTION_STRING: zookeeper:2181
-    EVENTUATELOCAL_CDC_DB_USER_NAME: root
-    EVENTUATELOCAL_CDC_DB_PASSWORD: rootpassword
-    EVENTUATELOCAL_CDC_READER_NAME: Reader
-    EVENTUATELOCAL_CDC_OFFSET_STORE_KEY: MySqlBinlog
-    EVENTUATELOCAL_CDC_MYSQL_BINLOG_CLIENT_UNIQUE_ID: 1234567890
-    EVENTUATELOCAL_CDC_READ_OLD_DEBEZIUM_DB_OFFSET_STORAGE_TOPIC: "false"
+  cdcservice:
+    image: eventuateio/eventuate-cdc-service:0.6.0.RELEASE
+    ports:
+      - "8099:8080"
+    depends_on:
+      - mysql
+      - kafka
+      - zookeeper
+    environment:
+      SPRING_DATASOURCE_URL: jdbc:mysql://mysql/eventuate
+      SPRING_DATASOURCE_USERNAME: mysqluser
+      SPRING_DATASOURCE_PASSWORD: mysqlpw
+      SPRING_DATASOURCE_DRIVER_CLASS_NAME: com.mysql.jdbc.Driver
+      EVENTUATELOCAL_KAFKA_BOOTSTRAP_SERVERS: kafka:29092
+      EVENTUATELOCAL_ZOOKEEPER_CONNECTION_STRING: zookeeper:2181
+      EVENTUATELOCAL_CDC_DB_USER_NAME: root
+      EVENTUATELOCAL_CDC_DB_PASSWORD: rootpassword
+      EVENTUATELOCAL_CDC_READER_NAME: Reader
+      EVENTUATELOCAL_CDC_OFFSET_STORE_KEY: MySqlBinlog
+      EVENTUATELOCAL_CDC_MYSQL_BINLOG_CLIENT_UNIQUE_ID: 1234567890
+      EVENTUATELOCAL_CDC_READ_OLD_DEBEZIUM_DB_OFFSET_STORAGE_TOPIC: "false"
diff --git a/docker-compose-mysql-polling.yml b/docker-compose-mysql-polling.yml
@@ -1,58 +1,63 @@
-zookeeper:
-  image: eventuateio/eventuateio-local-zookeeper:0.30.0.M14
-  ports:
-    - 2181:2181
-    - 2888:2888
-    - 3888:3888
+version: '3'
+services:
+  zookeeper:
+    image: confluentinc/cp-zookeeper:5.2.4
+    ports:
+      - 2181:2181
+    environment:
+      ZOOKEEPER_CLIENT_PORT: 2181
 
-kafka:
-  image: eventuateio/eventuateio-local-kafka:0.30.0.M14
-  ports:
-    - 9092:9092
-  links:
-    - zookeeper
-  environment:
-    - ADVERTISED_HOST_NAME=${DOCKER_HOST_IP}
-    - KAFKA_HEAP_OPTS=-Xmx320m -Xms320m
-    - ZOOKEEPER_SERVERS=zookeeper:2181
+  kafka:
+    image: "confluentinc/cp-enterprise-kafka:5.2.4"
+    ports:
+      - 9092:9092
+      - 29092:29092
+    depends_on:
+      - zookeeper
+    environment:
+      KAFKA_LISTENERS: LC://kafka:29092,LX://kafka:9092
+      KAFKA_ADVERTISED_LISTENERS: LC://kafka:29092,LX://localhost:9092
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: LC:PLAINTEXT,LX:PLAINTEXT
+      KAFKA_INTER_BROKER_LISTENER_NAME: LC
+      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
+      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
 
+  mysql:
+    image: eventuateio/eventuate-mysql:0.9.0.RELEASE
+    ports:
+      - 3306:3306
+    environment:
+      - MYSQL_ROOT_PASSWORD=rootpassword
+      - MYSQL_USER=mysqluser
+      - MYSQL_PASSWORD=mysqlpw
 
-mysql:
-  image: eventuateio/eventuate-tram-mysql:0.20.0.M10
-  ports:
-    - 3306:3306
-  environment:
-    - MYSQL_ROOT_PASSWORD=rootpassword
-    - MYSQL_USER=mysqluser
-    - MYSQL_PASSWORD=mysqlpw
+  mongodb:
+    image: mongo:3.0.4
+    hostname: mongodb
+    command: mongod --smallfiles
+    ports:
+      - "27017:27017"
 
-mongodb:
-  image: mongo:3.0.4
-  hostname: mongodb
-  command: mongod --smallfiles
-  ports:
-    - "27017:27017"
-
-cdcservice:
-  image: eventuateio/eventuate-cdc-service:local-test
-  ports:
-    - "8099:8080"
-  links:
-    - mysql
-    - kafka
-    - zookeeper
-  environment:
-    SPRING_DATASOURCE_URL: jdbc:mysql://mysql/eventuate
-    SPRING_DATASOURCE_USERNAME: mysqluser
-    SPRING_DATASOURCE_PASSWORD: mysqlpw
-    SPRING_DATASOURCE_DRIVER_CLASS_NAME: com.mysql.jdbc.Driver
-    EVENTUATELOCAL_KAFKA_BOOTSTRAP_SERVERS: kafka:9092
-    EVENTUATELOCAL_ZOOKEEPER_CONNECTION_STRING: zookeeper:2181
-    EVENTUATELOCAL_CDC_DB_USER_NAME: root
-    EVENTUATELOCAL_CDC_DB_PASSWORD: rootpassword
-    EVENTUATELOCAL_CDC_POLLING_INTERVAL_IN_MILLISECONDS: 500
-    EVENTUATELOCAL_CDC_MAX_EVENTS_PER_POLLING: 1000
-    EVENTUATELOCAL_CDC_MAX_ATTEMPTS_FOR_POLLING: 100
-    EVENTUATELOCAL_CDC_POLLING_RETRY_INTERVAL_IN_MILLISECONDS: 500
-    EVENTUATELOCAL_CDC_READER_NAME: Reader
-    SPRING_PROFILES_ACTIVE: EventuatePolling
+  cdcservice:
+    image: eventuateio/eventuate-cdc-service:0.6.0.RELEASE
+    ports:
+      - "8099:8080"
+    depends_on:
+      - mysql
+      - kafka
+      - zookeeper
+    environment:
+      SPRING_DATASOURCE_URL: jdbc:mysql://mysql/eventuate
+      SPRING_DATASOURCE_USERNAME: mysqluser
+      SPRING_DATASOURCE_PASSWORD: mysqlpw
+      SPRING_DATASOURCE_DRIVER_CLASS_NAME: com.mysql.jdbc.Driver
+      EVENTUATELOCAL_KAFKA_BOOTSTRAP_SERVERS: kafka:9092
+      EVENTUATELOCAL_ZOOKEEPER_CONNECTION_STRING: zookeeper:2181
+      EVENTUATELOCAL_CDC_DB_USER_NAME: root
+      EVENTUATELOCAL_CDC_DB_PASSWORD: rootpassword
+      EVENTUATELOCAL_CDC_POLLING_INTERVAL_IN_MILLISECONDS: 500
+      EVENTUATELOCAL_CDC_MAX_EVENTS_PER_POLLING: 1000
+      EVENTUATELOCAL_CDC_MAX_ATTEMPTS_FOR_POLLING: 100
+      EVENTUATELOCAL_CDC_POLLING_RETRY_INTERVAL_IN_MILLISECONDS: 500
+      EVENTUATELOCAL_CDC_READER_NAME: Reader
+      SPRING_PROFILES_ACTIVE: EventuatePolling
diff --git a/docker-compose-postgres-polling.yml b/docker-compose-postgres-polling.yml
@@ -1,56 +1,62 @@
-zookeeper:
-  image: eventuateio/eventuateio-local-zookeeper:0.30.0.M14
-  ports:
-    - 2181:2181
-    - 2888:2888
-    - 3888:3888
+version: '3'
+services:
+  zookeeper:
+    image: confluentinc/cp-zookeeper:5.2.4
+    ports:
+      - 2181:2181
+    environment:
+      ZOOKEEPER_CLIENT_PORT: 2181
 
-kafka:
-  image: eventuateio/eventuateio-local-kafka:0.30.0.M14
-  ports:
-    - 9092:9092
-  links:
-    - zookeeper
-  environment:
-    - ADVERTISED_HOST_NAME=${DOCKER_HOST_IP}
-    - KAFKA_HEAP_OPTS=-Xmx320m -Xms320m
-    - ZOOKEEPER_SERVERS=zookeeper:2181
+  kafka:
+    image: "confluentinc/cp-enterprise-kafka:5.2.4"
+    ports:
+      - 9092:9092
+      - 29092:29092
+    depends_on:
+      - zookeeper
+    environment:
+      KAFKA_LISTENERS: LC://kafka:29092,LX://kafka:9092
+      KAFKA_ADVERTISED_LISTENERS: LC://kafka:29092,LX://localhost:9092
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: LC:PLAINTEXT,LX:PLAINTEXT
+      KAFKA_INTER_BROKER_LISTENER_NAME: LC
+      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
+      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
 
-postgres:
-  image: eventuateio/eventuate-tram-postgres:0.20.0.M10
-  ports:
-    - 5432:5432
-  environment:
-    POSTGRES_USER: eventuate
-    POSTGRES_PASSWORD: eventuate
+  postgres:
+    image: eventuateio/eventuate-postgres:0.9.0.RELEASE
+    ports:
+      - 5432:5432
+    environment:
+      POSTGRES_USER: eventuate
+      POSTGRES_PASSWORD: eventuate
 
-mongodb:
-  image: mongo:3.0.4
-  hostname: mongodb
-  command: mongod --smallfiles
-  ports:
-    - "27017:27017"
+  mongodb:
+    image: mongo:3.0.4
+    hostname: mongodb
+    command: mongod --smallfiles
+    ports:
+      - "27017:27017"
 
-cdcservice:
-  image: eventuateio/eventuate-cdc-service:local-test
-  links:
-    - postgres
-    - kafka
-    - zookeeper
-  ports:
-    - "8099:8080"
-  environment:
-    SPRING_DATASOURCE_URL: jdbc:postgresql://postgres/eventuate
-    SPRING_DATASOURCE_USERNAME: eventuate
-    SPRING_DATASOURCE_PASSWORD: eventuate
-    SPRING_DATASOURCE_TEST_ON_BORROW: "true"
-    SPRING_DATASOURCE_VALIDATION_QUERY: SELECT 1
-    SPRING_DATASOURCE_DRIVER_CLASS_NAME: org.postgresql.Driver
-    EVENTUATELOCAL_KAFKA_BOOTSTRAP_SERVERS: kafka:9092
-    EVENTUATELOCAL_ZOOKEEPER_CONNECTION_STRING: zookeeper:2181
-    EVENTUATELOCAL_CDC_POLLING_INTERVAL_IN_MILLISECONDS: 500
-    EVENTUATELOCAL_CDC_MAX_EVENTS_PER_POLLING: 1000
-    EVENTUATELOCAL_CDC_MAX_ATTEMPTS_FOR_POLLING: 100
-    EVENTUATELOCAL_CDC_POLLING_RETRY_INTERVAL_IN_MILLISECONDS: 500
-    EVENTUATELOCAL_CDC_READER_NAME: Reader
-    SPRING_PROFILES_ACTIVE: EventuatePolling
+  cdcservice:
+    image: eventuateio/eventuate-cdc-service:0.6.0.RELEASE
+    depends_on:
+      - postgres
+      - kafka
+      - zookeeper
+    ports:
+      - "8099:8080"
+    environment:
+      SPRING_DATASOURCE_URL: jdbc:postgresql://postgres/eventuate
+      SPRING_DATASOURCE_USERNAME: eventuate
+      SPRING_DATASOURCE_PASSWORD: eventuate
+      SPRING_DATASOURCE_TEST_ON_BORROW: "true"
+      SPRING_DATASOURCE_VALIDATION_QUERY: SELECT 1
+      SPRING_DATASOURCE_DRIVER_CLASS_NAME: org.postgresql.Driver
+      EVENTUATELOCAL_KAFKA_BOOTSTRAP_SERVERS: kafka:9092
+      EVENTUATELOCAL_ZOOKEEPER_CONNECTION_STRING: zookeeper:2181
+      EVENTUATELOCAL_CDC_POLLING_INTERVAL_IN_MILLISECONDS: 500
+      EVENTUATELOCAL_CDC_MAX_EVENTS_PER_POLLING: 1000
+      EVENTUATELOCAL_CDC_MAX_ATTEMPTS_FOR_POLLING: 100
+      EVENTUATELOCAL_CDC_POLLING_RETRY_INTERVAL_IN_MILLISECONDS: 500
+      EVENTUATELOCAL_CDC_READER_NAME: Reader
+      SPRING_PROFILES_ACTIVE: EventuatePolling