Skip to content

Commit db778ec

Browse files
cercer
committed
Renamed docker containers to make them more readable
1 parent 49f9cad commit db778ec

File tree

4 files changed

+21
-30
lines changed

4 files changed

+21
-30
lines changed

‎build-and-restart-service.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#! /bin/bash -e
22

33
SNX=${1}
4-
SN=${SNX//-/}
4+
SN=${SNX?}
55

66

77
./gradlew :${SNX?}:assemble

‎build-and-test-all.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
#! /bin/bash -e
22

3+
. ./set-env.sh
34

45
docker-compose down -v
56
docker-compose up -d --build mysql
67

78
./wait-for-mysql.sh
89

9-
docker-compose up -d --build eventuatelocalcdcservice tramcdcservice
10+
docker-compose up -d --build eventuate-local-cdc-service tram-cdc-service
1011

1112
./gradlew -x :ftgo-end-to-end-tests:test build
1213

‎docker-compose.yml

Lines changed: 17 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,13 @@ services:
2424
- MYSQL_ROOT_PASSWORD=rootpassword
2525
- MYSQL_USER=mysqluser
2626
- MYSQL_PASSWORD=mysqlpw
27-
tramcdcservice:
27+
tram-cdc-service:
2828
image: eventuateio/eventuate-tram-cdc-mysql-service:0.0.1
2929
ports:
3030
- "8099:8080"
3131
depends_on:
3232
- mysql
3333
- kafka
34-
- zookeeper
3534
environment:
3635
SPRING_DATASOURCE_URL: jdbc:mysql://mysql/eventuate
3736
SPRING_DATASOURCE_USERNAME: mysqluser
@@ -43,14 +42,13 @@ services:
4342
EVENTUATELOCAL_CDC_DB_PASSWORD: rootpassword
4443
EVENTUATELOCAL_CDC_BINLOG_CLIENT_ID: 1234567890
4544
EVENTUATELOCAL_CDC_SOURCE_TABLE_NAME: message
46-
eventuatelocalcdcservice:
45+
eventuate-local-cdc-service:
4746
image: eventuateio/eventuateio-local-cdc-service:0.14.0
4847
ports:
4948
- "8098:8080"
5049
depends_on:
5150
- mysql
5251
- kafka
53-
- zookeeper
5452
environment:
5553
SPRING_DATASOURCE_URL: jdbc:mysql://mysql/eventuate
5654
SPRING_DATASOURCE_USERNAME: mysqluser
@@ -61,121 +59,113 @@ services:
6159
EVENTUATELOCAL_CDC_DB_USER_NAME: root
6260
EVENTUATELOCAL_CDC_DB_PASSWORD: rootpassword
6361
EVENTUATELOCAL_CDC_LEADERSHIP_LOCK_PATH: /eventuatelocal/cdc/leader1
64-
ftgoconsumerservice:
62+
ftgo-consumer-service:
6563
build: ./ftgo-consumer-service
6664
ports:
6765
- "8081:8080"
6866
depends_on:
6967
- mysql
7068
- kafka
71-
- zookeeper
69+
- tram-cdc-service
7270
environment:
7371
SPRING_DATASOURCE_URL: jdbc:mysql://mysql/eventuate
7472
SPRING_DATASOURCE_USERNAME: mysqluser
7573
SPRING_DATASOURCE_PASSWORD: mysqlpw
7674
SPRING_DATASOURCE_DRIVER_CLASS_NAME: com.mysql.jdbc.Driver
7775
EVENTUATELOCAL_KAFKA_BOOTSTRAP_SERVERS: kafka:9092
7876
EVENTUATELOCAL_ZOOKEEPER_CONNECTION_STRING: zookeeper:2181
79-
EVENTUATELOCAL_CDC_DB_USER_NAME: root
80-
EVENTUATELOCAL_CDC_DB_PASSWORD: rootpassword
8177
JAVA_OPTS: -Xmx256m
82-
ftgoorderservice:
78+
ftgo-order-service:
8379
build: ./ftgo-order-service
8480
ports:
8581
- "8082:8080"
8682
depends_on:
8783
- mysql
8884
- kafka
89-
- zookeeper
85+
- tram-cdc-service
9086
environment:
9187
SPRING_DATASOURCE_URL: jdbc:mysql://mysql/eventuate
9288
SPRING_DATASOURCE_USERNAME: mysqluser
9389
SPRING_DATASOURCE_PASSWORD: mysqlpw
9490
SPRING_DATASOURCE_DRIVER_CLASS_NAME: com.mysql.jdbc.Driver
9591
EVENTUATELOCAL_KAFKA_BOOTSTRAP_SERVERS: kafka:9092
9692
EVENTUATELOCAL_ZOOKEEPER_CONNECTION_STRING: zookeeper:2181
97-
EVENTUATELOCAL_CDC_DB_USER_NAME: root
98-
EVENTUATELOCAL_CDC_DB_PASSWORD: rootpassword
9993
JAVA_OPTS: -Xmx256m
100-
ftgorestaurantorderservice:
94+
ftgo-restaurant-order-service:
10195
build: ./ftgo-restaurant-order-service
10296
ports:
10397
- "8083:8080"
10498
depends_on:
10599
- mysql
106100
- kafka
107101
- zookeeper
102+
- tram-cdc-service
108103
environment:
109104
SPRING_DATASOURCE_URL: jdbc:mysql://mysql/eventuate
110105
SPRING_DATASOURCE_USERNAME: mysqluser
111106
SPRING_DATASOURCE_PASSWORD: mysqlpw
112107
SPRING_DATASOURCE_DRIVER_CLASS_NAME: com.mysql.jdbc.Driver
113108
EVENTUATELOCAL_KAFKA_BOOTSTRAP_SERVERS: kafka:9092
114109
EVENTUATELOCAL_ZOOKEEPER_CONNECTION_STRING: zookeeper:2181
115-
EVENTUATELOCAL_CDC_DB_USER_NAME: root
116-
EVENTUATELOCAL_CDC_DB_PASSWORD: rootpassword
117110
JAVA_OPTS: -Xmx256m
118-
ftgorestaurantservice:
111+
ftgo-restaurant-service:
119112
build: ./ftgo-restaurant-service
120113
ports:
121114
- "8084:8080"
122115
depends_on:
123116
- mysql
124117
- kafka
125118
- zookeeper
119+
- tram-cdc-service
126120
environment:
127121
SPRING_DATASOURCE_URL: jdbc:mysql://mysql/eventuate
128122
SPRING_DATASOURCE_USERNAME: mysqluser
129123
SPRING_DATASOURCE_PASSWORD: mysqlpw
130124
SPRING_DATASOURCE_DRIVER_CLASS_NAME: com.mysql.jdbc.Driver
131125
EVENTUATELOCAL_KAFKA_BOOTSTRAP_SERVERS: kafka:9092
132126
EVENTUATELOCAL_ZOOKEEPER_CONNECTION_STRING: zookeeper:2181
133-
EVENTUATELOCAL_CDC_DB_USER_NAME: root
134-
EVENTUATELOCAL_CDC_DB_PASSWORD: rootpassword
135127
JAVA_OPTS: -Xmx256m
136-
ftgoaccountingservice:
128+
ftgo-accounting-service:
137129
build: ./ftgo-accounting-service
138130
ports:
139131
- "8085:8080"
140132
depends_on:
141133
- mysql
142134
- kafka
143135
- zookeeper
136+
- eventuate-local-cdc-service
144137
environment:
145138
SPRING_DATASOURCE_URL: jdbc:mysql://mysql/eventuate
146139
SPRING_DATASOURCE_USERNAME: mysqluser
147140
SPRING_DATASOURCE_PASSWORD: mysqlpw
148141
SPRING_DATASOURCE_DRIVER_CLASS_NAME: com.mysql.jdbc.Driver
149142
EVENTUATELOCAL_KAFKA_BOOTSTRAP_SERVERS: kafka:9092
150143
EVENTUATELOCAL_ZOOKEEPER_CONNECTION_STRING: zookeeper:2181
151-
EVENTUATELOCAL_CDC_DB_USER_NAME: root
152-
EVENTUATELOCAL_CDC_DB_PASSWORD: rootpassword
153144
JAVA_OPTS: -Xmx256m
154-
ftgoorderhistoryservice:
145+
ftgo-order-history-service:
155146
build: ./ftgo-order-history-service
156147
ports:
157148
- "8086:8080"
158149
depends_on:
159150
- mysql
160151
- kafka
161152
- zookeeper
153+
- tram-cdc-service
162154
environment:
163155
SPRING_DATASOURCE_URL: jdbc:mysql://mysql/eventuate
164156
SPRING_DATASOURCE_USERNAME: mysqluser
165157
SPRING_DATASOURCE_PASSWORD: mysqlpw
166158
SPRING_DATASOURCE_DRIVER_CLASS_NAME: com.mysql.jdbc.Driver
167159
EVENTUATELOCAL_KAFKA_BOOTSTRAP_SERVERS: kafka:9092
168160
EVENTUATELOCAL_ZOOKEEPER_CONNECTION_STRING: zookeeper:2181
169-
EVENTUATELOCAL_CDC_DB_USER_NAME: root
170-
EVENTUATELOCAL_CDC_DB_PASSWORD: rootpassword
171161
AWS_ACCESS_KEY_ID: $AWS_ACCESS_KEY_ID
172162
AWS_SECRET_ACCESS_KEY: $AWS_SECRET_ACCESS_KEY
173163
JAVA_OPTS: -Xmx256m
174-
ftgoapigateway:
164+
ftgo-api-gateway:
175165
build: ./ftgo-api-gateway
176166
ports:
177167
- "8087:8080"
178168
environment:
179-
ORDER_DESTINATIONS_ORDERSERVICEURL: http://ftgoorderservice:8080
180-
ORDER_DESTINATIONS_ORDERHISTORYSERVICEURL: http://ftgoorderhistoryservice:8080
169+
ORDER_DESTINATIONS_ORDERSERVICEURL: http://ftgo-order-service:8080
170+
ORDER_DESTINATIONS_ORDERHISTORYSERVICEURL: http://ftgo-order-history-service:8080
181171
JAVA_OPTS: -Xmx256m

‎wait-for-services.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
done=false
44

55
host=$DOCKER_HOST_IP
6-
ports="8081 8082 8083 8084 8085 8086"
6+
ports="8081 8082 8083 8084 8085 8086 8099 8098"
77

88
while [[ "$done" = false ]]; do
99
for port in $ports; do

0 commit comments

Comments
 (0)