Merge pull request #85 from dartartem/development

#84: Build 627 failed. Order state is pending instead of rejected. Ad…
eventuate-tram · Mar 26, 2021 · 1fea651 · 1fea651
2 parents 0e88b27 + 4328778
commit 1fea651
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -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"