From 7331083761e73d47cb72cb27a2d789ff55da44f8 Mon Sep 17 00:00:00 2001 From: Artem Sidorkin Date: Thu, 30 May 2019 15:00:02 +0300 Subject: [PATCH] updated libraries --- _build-and-test-all.sh | 4 ++-- docker-compose-mysql-binlog.yml | 20 +++++++++++--------- docker-compose-postgres-polling.yml | 15 ++++++++------- docker-compose-postgres-wal.yml | 15 ++++++++------- gradle.properties | 4 ++-- postgres-cli.sh | 7 ++++--- rabbitmq/Dockerfile | 2 ++ 7 files changed, 37 insertions(+), 30 deletions(-) create mode 100644 rabbitmq/Dockerfile diff --git a/_build-and-test-all.sh b/_build-and-test-all.sh index fbbaf62..6748c8c 100755 --- a/_build-and-test-all.sh +++ b/_build-and-test-all.sh @@ -6,11 +6,11 @@ set -e docker-compose -f docker-compose-${DATABASE}-${MODE}.yml down -v -docker-compose -f docker-compose-${DATABASE}-${MODE}.yml up -d ${DATABASE} +docker-compose -f docker-compose-${DATABASE}-${MODE}.yml up -d ${DATABASE} zookeeper ${BROKER} ./wait-for-${DATABASE}.sh -docker-compose -f docker-compose-${DATABASE}-${MODE}.yml up -d zookeeper ${BROKER} cdcservice +docker-compose -f docker-compose-${DATABASE}-${MODE}.yml up -d cdcservice ./wait-for-services.sh $DOCKER_HOST_IP 8099 ./gradlew :eventuate-tram-examples-jdbc-${BROKER}:cleanTest :eventuate-tram-examples-jdbc-${BROKER}:test diff --git a/docker-compose-mysql-binlog.yml b/docker-compose-mysql-binlog.yml index 50d58ce..f4508cc 100755 --- a/docker-compose-mysql-binlog.yml +++ b/docker-compose-mysql-binlog.yml @@ -1,14 +1,14 @@ version: '2' services: zookeeper: - image: eventuateio/eventuateio-local-zookeeper:0.18.0.RELEASE + image: eventuateio/eventuateio-local-zookeeper:0.30.2.RELEASE ports: - 2181:2181 - 2888:2888 - 3888:3888 kafka: - image: eventuateio/eventuateio-local-kafka:0.18.0.RELEASE + image: eventuateio/eventuateio-local-kafka:0.30.2.RELEASE ports: - 9092:9092 links: @@ -28,12 +28,12 @@ services: - 61614:61614 rabbitmq: - image: test-eventuate-tram-rabbitmq + build: ./rabbitmq ports: - 5672:5672 mysql: - image: test-eventuate-tram-mysql + image: eventuateio/eventuate-tram-mysql:0.21.2.RELEASE ports: - 3306:3306 environment: @@ -42,7 +42,7 @@ services: - MYSQL_PASSWORD=mysqlpw cdcservice: - image: test-eventuate-tram-cdc-mysql-service + image: eventuateio/eventuate-tram-cdc-mysql-service:0.21.2.RELEASE ports: - "8099:8080" depends_on: @@ -60,8 +60,10 @@ services: EVENTUATELOCAL_ZOOKEEPER_CONNECTION_STRING: zookeeper:2181 EVENTUATELOCAL_CDC_DB_USER_NAME: root EVENTUATELOCAL_CDC_DB_PASSWORD: rootpassword - EVENTUATELOCAL_CDC_BINLOG_CLIENT_ID: 1234567890 - EVENTUATELOCAL_CDC_SOURCE_TABLE_NAME: message + EVENTUATELOCAL_CDC_READER_NAME: MySqlReader + EVENTUATELOCAL_CDC_OFFSET_STORE_KEY: MySqlBinlog + EVENTUATELOCAL_CDC_MYSQL_BINLOG_CLIENT_UNIQUE_ID: 1234567890 + EVENTUATELOCAL_CDC_READ_OLD_DEBEZIUM_DB_OFFSET_STORAGE_TOPIC: "false" SPRING_PROFILES_ACTIVE: ${SPRING_PROFILES_ACTIVE} - ACTIVEMQ_URL: tcp://${DOCKER_HOST_IP}:61616 - RABBITMQ_URL: ${DOCKER_HOST_IP} \ No newline at end of file + ACTIVEMQ_URL: tcp://activemq:61616 + RABBITMQ_URL: rabbitmq diff --git a/docker-compose-postgres-polling.yml b/docker-compose-postgres-polling.yml index 37ce150..3af9480 100755 --- a/docker-compose-postgres-polling.yml +++ b/docker-compose-postgres-polling.yml @@ -1,14 +1,14 @@ version: '2' services: zookeeper: - image: eventuateio/eventuateio-local-zookeeper:0.18.0.RELEASE + image: eventuateio/eventuateio-local-zookeeper:0.30.2.RELEASE ports: - 2181:2181 - 2888:2888 - 3888:3888 kafka: - image: eventuateio/eventuateio-local-kafka:0.18.0.RELEASE + image: eventuateio/eventuateio-local-kafka:0.30.2.RELEASE ports: - 9092:9092 links: @@ -28,12 +28,12 @@ services: - 61614:61614 rabbitmq: - image: test-eventuate-tram-rabbitmq + build: ./rabbitmq ports: - 5672:5672 postgres: - image: test-eventuate-tram-postgres + image: eventuateio/eventuate-tram-postgres:0.21.0.RELEASE ports: - 5432:5432 environment: @@ -41,7 +41,7 @@ services: POSTGRES_PASSWORD: eventuate cdcservice: - image: test-eventuate-tram-cdc-mysql-service + image: eventuateio/eventuate-tram-cdc-mysql-service:0.21.2.RELEASE links: - postgres - kafka @@ -63,6 +63,7 @@ services: 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: PostgresPollingReader SPRING_PROFILES_ACTIVE: ${SPRING_PROFILES_ACTIVE} - ACTIVEMQ_URL: tcp://${DOCKER_HOST_IP}:61616 - RABBITMQ_URL: ${DOCKER_HOST_IP} \ No newline at end of file + ACTIVEMQ_URL: tcp://activemq:61616 + RABBITMQ_URL: rabbitmq \ No newline at end of file diff --git a/docker-compose-postgres-wal.yml b/docker-compose-postgres-wal.yml index 4a43a0f..09d84dd 100755 --- a/docker-compose-postgres-wal.yml +++ b/docker-compose-postgres-wal.yml @@ -1,14 +1,14 @@ version: '2' services: zookeeper: - image: eventuateio/eventuateio-local-zookeeper:0.18.0.RELEASE + image: eventuateio/eventuateio-local-zookeeper:0.30.2.RELEASE ports: - 2181:2181 - 2888:2888 - 3888:3888 kafka: - image: eventuateio/eventuateio-local-kafka:0.18.0.RELEASE + image: eventuateio/eventuateio-local-kafka:0.30.2.RELEASE ports: - 9092:9092 links: @@ -28,12 +28,12 @@ services: - 61614:61614 rabbitmq: - image: test-eventuate-tram-rabbitmq + build: ./rabbitmq ports: - 5672:5672 postgres: - image: test-eventuate-tram-postgres + image: eventuateio/eventuate-tram-postgres:0.21.0.RELEASE ports: - 5432:5432 environment: @@ -41,7 +41,7 @@ services: POSTGRES_PASSWORD: eventuate cdcservice: - image: test-eventuate-tram-cdc-mysql-service + image: eventuateio/eventuate-tram-cdc-mysql-service:0.21.2.RELEASE links: - postgres - kafka @@ -59,6 +59,7 @@ services: SPRING_DATASOURCE_DRIVER_CLASS_NAME: org.postgresql.Driver EVENTUATELOCAL_KAFKA_BOOTSTRAP_SERVERS: kafka:9092 EVENTUATELOCAL_ZOOKEEPER_CONNECTION_STRING: zookeeper:2181 + EVENTUATELOCAL_CDC_READER_NAME: PostgresWalReader SPRING_PROFILES_ACTIVE: ${SPRING_PROFILES_ACTIVE} - ACTIVEMQ_URL: tcp://${DOCKER_HOST_IP}:61616 - RABBITMQ_URL: ${DOCKER_HOST_IP} \ No newline at end of file + ACTIVEMQ_URL: tcp://activemq:61616 + RABBITMQ_URL: rabbitmq \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index a23aa65..7aff18b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ deployUrl=file:///Users/cer/.m2/testdeploy eventuateMavenRepoUrl=https://dl.bintray.com/eventuateio-oss/eventuate-maven-release,file:///Users/cer/.m2/testdeploy -springBootVersion=1.4.5.RELEASE +springBootVersion=2.1.1.RELEASE version=0.1.0-SNAPSHOT -eventuateTramVersion=0.6.0-SNAPSHOT +eventuateTramVersion=0.21.2.RELEASE diff --git a/postgres-cli.sh b/postgres-cli.sh index 1099844..756f473 100755 --- a/postgres-cli.sh +++ b/postgres-cli.sh @@ -1,6 +1,7 @@ #! /bin/bash -e docker run $* \ - --network eventuatetramcoreexamplesbasic_default \ - --name postgresterm --link $(echo ${PWD##*/} | sed -e 's/-//g')_postgres_1:postgres --rm postgres:9.6.5 \ - sh -c 'export PGPASSWORD="eventuate"; exec psql -h postgres -U "eventuate" ' + --name postgresterm \ + -e POSTGRES_HOST=$DOCKER_HOST_IP \ + --rm postgres:9.6.5 \ + sh -c 'export PGPASSWORD=eventuate; exec psql -h "$POSTGRES_HOST" -U eventuate' diff --git a/rabbitmq/Dockerfile b/rabbitmq/Dockerfile new file mode 100644 index 0000000..bf99b02 --- /dev/null +++ b/rabbitmq/Dockerfile @@ -0,0 +1,2 @@ +FROM rabbitmq:3.6 +RUN rabbitmq-plugins enable rabbitmq_consistent_hash_exchange \ No newline at end of file