From 43287786942db3836fdddadfd3d7cc34d68b0c96 Mon Sep 17 00:00:00 2001
From: Artem Sidorkin <artem.sidorkin@digitalarrowtech.com>
Date: Fri, 26 Mar 2021 17:19:56 +0300
Subject: [PATCH] #84: Build 627 failed. Order state is pending instead of
 rejected. Added cdc restart after db id migration.

---
 _build-and-test-all.sh          | 3 +++
 docker-compose-postgres-wal.yml | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/_build-and-test-all.sh b/_build-and-test-all.sh
index fe84418..ff47e86 100755
--- a/_build-and-test-all.sh
+++ b/_build-and-test-all.sh
@@ -35,8 +35,11 @@ echo 'show dbs' |  ./mongodb-cli.sh -i
 
 ./wait-for-services.sh localhost readers/${READER}/finished "8099"
 
+compose="docker-compose -f docker-compose-${DATABASE}-${MODE}.yml "
 
+$compose stop cdc-service
 curl -s https://raw.githubusercontent.com/eventuate-foundation/eventuate-common/master/migration/db-id/migration.sh &> /dev/stdout | bash
+$compose start cdc-service
 
 
 ${dockerall}Up -P envFile=docker-compose-env-files/db-id-gen.env
diff --git a/docker-compose-postgres-wal.yml b/docker-compose-postgres-wal.yml
index b45b731..18ca982 100755
--- a/docker-compose-postgres-wal.yml
+++ b/docker-compose-postgres-wal.yml
@@ -6,7 +6,7 @@ services:
     build:
       context: ./order-service/
       args:
-        baseImageVersion: ${EVENTUATE_JAVA_BASE_IMAGE_VERSION?}
+        baseImageVersion: ${EVENTUATE_JAVA_BASE_IMAGE_VERSION}
     image: eventuateexamples/eventuate-tram-examples-customers-and-orders-order-service
     ports:
       - "8081:8080"
@@ -30,7 +30,7 @@ services:
     build:
       context: ./customer-service/
       args:
-        baseImageVersion: ${EVENTUATE_JAVA_BASE_IMAGE_VERSION?}
+        baseImageVersion: ${EVENTUATE_JAVA_BASE_IMAGE_VERSION}
     image: eventuateexamples/eventuate-tram-examples-customers-and-orders-customer-service
     ports:
       - "8082:8080"
@@ -54,7 +54,7 @@ services:
     build:
       context: ./order-history-service/
       args:
-        baseImageVersion: ${EVENTUATE_JAVA_BASE_IMAGE_VERSION?}
+        baseImageVersion: ${EVENTUATE_JAVA_BASE_IMAGE_VERSION}
     image: eventuateexamples/eventuate-tram-examples-customers-and-orders-order-history-service
     ports:
       - "8083:8080"