Renamed docker containers to make them more readable

microservices-patterns · Nov 7, 2017 · db778ec · db778ec
1 parent 49f9cad
commit db778ec
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 30 deletions.
diff --git a/build-and-restart-service.sh b/build-and-restart-service.sh
@@ -1,7 +1,7 @@
 #! /bin/bash -e
 
 SNX=${1}
-SN=${SNX//-/}
+SN=${SNX?}
 
 
 ./gradlew :${SNX?}:assemble

diff --git a/build-and-test-all.sh b/build-and-test-all.sh
@@ -1,12 +1,13 @@
 #! /bin/bash -e
 
+. ./set-env.sh
 
 docker-compose down -v
 docker-compose up -d --build mysql
 
 ./wait-for-mysql.sh
 
-docker-compose up -d --build eventuatelocalcdcservice tramcdcservice
+docker-compose up -d --build eventuate-local-cdc-service tram-cdc-service
 
 ./gradlew -x :ftgo-end-to-end-tests:test build
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -24,14 +24,13 @@ services:
       - MYSQL_ROOT_PASSWORD=rootpassword
       - MYSQL_USER=mysqluser
       - MYSQL_PASSWORD=mysqlpw
-  tramcdcservice:
+  tram-cdc-service:
     image: eventuateio/eventuate-tram-cdc-mysql-service:0.0.1
     ports:
       - "8099:8080"
     depends_on:
       - mysql
       - kafka
-      - zookeeper
     environment:
       SPRING_DATASOURCE_URL: jdbc:mysql://mysql/eventuate
       SPRING_DATASOURCE_USERNAME: mysqluser
@@ -43,14 +42,13 @@ services:
       EVENTUATELOCAL_CDC_DB_PASSWORD: rootpassword
       EVENTUATELOCAL_CDC_BINLOG_CLIENT_ID: 1234567890
       EVENTUATELOCAL_CDC_SOURCE_TABLE_NAME: message
-  eventuatelocalcdcservice:
+  eventuate-local-cdc-service:
     image: eventuateio/eventuateio-local-cdc-service:0.14.0
     ports:
       - "8098:8080"
     depends_on:
       - mysql
       - kafka
-      - zookeeper
     environment:
       SPRING_DATASOURCE_URL: jdbc:mysql://mysql/eventuate
       SPRING_DATASOURCE_USERNAME: mysqluser
@@ -61,121 +59,113 @@ services:
       EVENTUATELOCAL_CDC_DB_USER_NAME: root
       EVENTUATELOCAL_CDC_DB_PASSWORD: rootpassword
       EVENTUATELOCAL_CDC_LEADERSHIP_LOCK_PATH: /eventuatelocal/cdc/leader1
-  ftgoconsumerservice:
+  ftgo-consumer-service:
     build: ./ftgo-consumer-service
     ports:
       - "8081:8080"
     depends_on:
       - mysql
       - kafka
-      - zookeeper
+      - tram-cdc-service
     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
       JAVA_OPTS: -Xmx256m
-  ftgoorderservice:
+  ftgo-order-service:
     build: ./ftgo-order-service
     ports:
       - "8082:8080"
     depends_on:
       - mysql
       - kafka
-      - zookeeper
+      - tram-cdc-service
     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
       JAVA_OPTS: -Xmx256m
-  ftgorestaurantorderservice:
+  ftgo-restaurant-order-service:
       build: ./ftgo-restaurant-order-service
       ports:
         - "8083:8080"
       depends_on:
         - mysql
         - kafka
         - zookeeper
+        - tram-cdc-service
       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
         JAVA_OPTS: -Xmx256m
-  ftgorestaurantservice:
+  ftgo-restaurant-service:
       build: ./ftgo-restaurant-service
       ports:
         - "8084:8080"
       depends_on:
         - mysql
         - kafka
         - zookeeper
+        - tram-cdc-service
       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
         JAVA_OPTS: -Xmx256m
-  ftgoaccountingservice:
+  ftgo-accounting-service:
         build: ./ftgo-accounting-service
         ports:
           - "8085:8080"
         depends_on:
           - mysql
           - kafka
           - zookeeper
+          - eventuate-local-cdc-service
         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
           JAVA_OPTS: -Xmx256m
-  ftgoorderhistoryservice:
+  ftgo-order-history-service:
         build: ./ftgo-order-history-service
         ports:
           - "8086:8080"
         depends_on:
           - mysql
           - kafka
           - zookeeper
+          - tram-cdc-service
         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
           AWS_ACCESS_KEY_ID: $AWS_ACCESS_KEY_ID
           AWS_SECRET_ACCESS_KEY: $AWS_SECRET_ACCESS_KEY
           JAVA_OPTS: -Xmx256m
-  ftgoapigateway:
+  ftgo-api-gateway:
     build: ./ftgo-api-gateway
     ports:
       - "8087:8080"
     environment:
-      ORDER_DESTINATIONS_ORDERSERVICEURL: http://ftgoorderservice:8080
-      ORDER_DESTINATIONS_ORDERHISTORYSERVICEURL: http://ftgoorderhistoryservice:8080
+      ORDER_DESTINATIONS_ORDERSERVICEURL: http://ftgo-order-service:8080
+      ORDER_DESTINATIONS_ORDERHISTORYSERVICEURL: http://ftgo-order-history-service:8080
       JAVA_OPTS: -Xmx256m
diff --git a/wait-for-services.sh b/wait-for-services.sh
@@ -3,7 +3,7 @@
 done=false
 
 host=$DOCKER_HOST_IP
-ports="8081 8082 8083 8084 8085 8086"
+ports="8081 8082 8083 8084 8085 8086 8099 8098"
 
 while [[ "$done" = false ]]; do
 	for port in $ports; do