This is an automated email from the ASF dual-hosted git repository.
xiaoyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new 0da23a7 refactor(integrated-test): format docker-compose.yml (#2620)
0da23a7 is described below
commit 0da23a73dfd660290a1171be5b8ed4d5e7bac6cd
Author: luoxiaolong <[email protected]>
AuthorDate: Sat Dec 18 17:26:00 2021 +0800
refactor(integrated-test): format docker-compose.yml (#2620)
---
.../docker-compose.yml | 8 ++++----
.../shenyu-integrated-test-grpc/docker-compose.yml | 10 +++++-----
.../shenyu-integrated-test-http/docker-compose.yml | 14 +++++++-------
.../docker-compose.yml | 6 +++---
.../docker-compose.yml | 18 ++++++++++--------
.../shenyu-integrated-test-sofa/docker-compose.yml | 15 ++++++++-------
.../docker-compose.yml | 22 +++++++++++++---------
.../docker-compose.yml | 10 +++++-----
.../docker-compose.yml | 5 ++++-
.../docker-compose.yml | 5 ++++-
10 files changed, 63 insertions(+), 50 deletions(-)
diff --git
a/shenyu-integrated-test/shenyu-integrated-test-combination/docker-compose.yml
b/shenyu-integrated-test/shenyu-integrated-test-combination/docker-compose.yml
index c0493dc..23b5916 100644
---
a/shenyu-integrated-test/shenyu-integrated-test-combination/docker-compose.yml
+++
b/shenyu-integrated-test/shenyu-integrated-test-combination/docker-compose.yml
@@ -47,7 +47,7 @@ services:
timeout: 2s
retries: 30
ports:
- - 8189:8189
+ - "8189:8189"
depends_on:
shenyu-integrated-test-combination:
condition: service_healthy
@@ -89,10 +89,10 @@ services:
shenyu-redis:
condition: service_healthy
ports:
- - 9095:9095
+ - "9095:9095"
environment:
- SPRING_PROFILES_ACTIVE=h2
- - "shenyu.database.init_script=sql-script/h2/schema.sql"
+ - shenyu.database.init_script=sql-script/h2/schema.sql
healthcheck:
test: ["CMD-SHELL", "wget -q -O -
http://shenyu-admin:9095/actuator/health | grep UP || exit 1"]
timeout: 2s
@@ -110,7 +110,7 @@ services:
shenyu-admin:
condition: service_healthy
ports:
- - 9195:9195
+ - "9195:9195"
networks:
- shenyu
healthcheck:
diff --git
a/shenyu-integrated-test/shenyu-integrated-test-grpc/docker-compose.yml
b/shenyu-integrated-test/shenyu-integrated-test-grpc/docker-compose.yml
index e27b5c8..32d6b6e 100644
--- a/shenyu-integrated-test/shenyu-integrated-test-grpc/docker-compose.yml
+++ b/shenyu-integrated-test/shenyu-integrated-test-grpc/docker-compose.yml
@@ -22,10 +22,10 @@ services:
networks:
- shenyu
ports:
- - 9095:9095
+ - "9095:9095"
environment:
- SPRING_PROFILES_ACTIVE=h2
- - "shenyu.database.init_script=sql-script/h2/schema.sql"
+ - shenyu.database.init_script=sql-script/h2/schema.sql
healthcheck:
test: ["CMD-SHELL", "wget -q -O -
http://shenyu-admin:9095/actuator/health | grep UP || exit 1"]
timeout: 2s
@@ -48,8 +48,8 @@ services:
retries: 3
start_period: 5s
ports:
- - 55290:55290
- - 8080:8080
+ - "55290:55290"
+ - "8080:8080"
networks:
- shenyu
depends_on:
@@ -70,7 +70,7 @@ services:
shenyu-admin:
condition: service_healthy
ports:
- - 9195:9195
+ - "9195:9195"
healthcheck:
test: [ "CMD", "wget", "-q", "-O", "-",
"http://shenyu-integrated-test-grpc:9195/actuator/health"; ]
timeout: 2s
diff --git
a/shenyu-integrated-test/shenyu-integrated-test-http/docker-compose.yml
b/shenyu-integrated-test/shenyu-integrated-test-http/docker-compose.yml
index a4bd8f1..5fb73e9 100644
--- a/shenyu-integrated-test/shenyu-integrated-test-http/docker-compose.yml
+++ b/shenyu-integrated-test/shenyu-integrated-test-http/docker-compose.yml
@@ -46,7 +46,7 @@ services:
timeout: 2s
retries: 30
ports:
- - 8189:8189
+ - "8189:8189"
depends_on:
shenyu-integrated-test-http:
condition: service_healthy
@@ -63,19 +63,18 @@ services:
shenyu-redis:
condition: service_healthy
ports:
- - 9095:9095
+ - "9095:9095"
environment:
- SPRING_PROFILES_ACTIVE=h2
- - "shenyu.database.init_script=sql-script/h2/schema.sql"
+ - shenyu.database.init_script=sql-script/h2/schema.sql
healthcheck:
test: ["CMD-SHELL", "wget -q -O -
http://shenyu-admin:9095/actuator/health | grep UP || exit 1"]
timeout: 2s
retries: 30
-# from http plugin dockerfile
+
shenyu-integrated-test-http:
container_name: shenyu-integrated-test-http
image: apache/shenyu-integrated-test-http:latest
-# image: apache/shenyu-bootstrap:2.4.0-SNAPSHOT
restart: always
deploy:
resources:
@@ -84,9 +83,10 @@ services:
environment:
- shenyu.sync.websocket.urls=ws://shenyu-admin:9095/websocket
depends_on:
- - shenyu-admin
+ shenyu-admin:
+ condition: service_healthy
ports:
- - 9195:9195
+ - "9195:9195"
networks:
- shenyu
healthcheck:
diff --git
a/shenyu-integrated-test/shenyu-integrated-test-https/docker-compose.yml
b/shenyu-integrated-test/shenyu-integrated-test-https/docker-compose.yml
index 618a2db..a3dcfab 100644
--- a/shenyu-integrated-test/shenyu-integrated-test-https/docker-compose.yml
+++ b/shenyu-integrated-test/shenyu-integrated-test-https/docker-compose.yml
@@ -25,7 +25,7 @@ services:
- "9095:9095"
environment:
- SPRING_PROFILES_ACTIVE=h2
- - "shenyu.database.init_script=sql-script/h2/schema.sql"
+ - shenyu.database.init_script=sql-script/h2/schema.sql
healthcheck:
test: [ "CMD-SHELL", "wget -q -O -
http://shenyu-admin:9095/actuator/health | grep UP || exit 1" ]
timeout: 2s
@@ -40,7 +40,7 @@ services:
limits:
memory: 2048M
environment:
- - "shenyu.sync.websocket.urls=ws://shenyu-admin:9095/websocket"
+ - shenyu.sync.websocket.urls=ws://shenyu-admin:9095/websocket
depends_on:
shenyu-admin:
condition: service_healthy
@@ -62,7 +62,7 @@ services:
image: shenyu-examples-https:latest
restart: always
environment:
- - "shenyu.register.serverLists=http://shenyu-admin:9095";
+ - shenyu.register.serverLists=http://shenyu-admin:9095
healthcheck:
test: [ "CMD", "wget",
"http://shenyu-examples-https:8080/order/findById?id=3"; ]
timeout: 2s
diff --git
a/shenyu-integrated-test/shenyu-integrated-test-motan/docker-compose.yml
b/shenyu-integrated-test/shenyu-integrated-test-motan/docker-compose.yml
index e5727de..ff2c031 100644
--- a/shenyu-integrated-test/shenyu-integrated-test-motan/docker-compose.yml
+++ b/shenyu-integrated-test/shenyu-integrated-test-motan/docker-compose.yml
@@ -21,6 +21,7 @@ services:
restart: always
networks:
- shenyu
+
shenyu-admin:
image: apache/shenyu-admin:latest
container_name: shenyu-admin
@@ -28,12 +29,13 @@ services:
networks:
- shenyu
depends_on:
- - shenyu-zk
+ shenyu-zk:
+ condition: service_started
ports:
- - 9095:9095
+ - "9095:9095"
environment:
- SPRING_PROFILES_ACTIVE=h2
- - "shenyu.database.init_script=sql-script/h2/schema.sql"
+ - shenyu.database.init_script=sql-script/h2/schema.sql
healthcheck:
test: [ "CMD-SHELL", "wget -q -O -
http://shenyu-admin:9095/actuator/health | grep UP || exit 1" ]
timeout: 2s
@@ -58,8 +60,8 @@ services:
retries: 3
start_period: 5s
ports:
- - 8081:8081
- - 8002:8002
+ - "8081:8081"
+ - "8002:8002"
networks:
- shenyu
depends_on:
@@ -77,10 +79,10 @@ services:
environment:
- shenyu.sync.websocket.urls=ws://shenyu-admin:9095/websocket
depends_on:
- - shenyu-examples-motan
- - shenyu-admin
+ shenyu-examples-motan:
+ condition: service_healthy
ports:
- - 9195:9195
+ - "9195:9195"
healthcheck:
test: [ "CMD", "wget", "-q", "-O", "-",
"http://shenyu-integrated-test-motan:9195/actuator/health"; ]
timeout: 2s
diff --git
a/shenyu-integrated-test/shenyu-integrated-test-sofa/docker-compose.yml
b/shenyu-integrated-test/shenyu-integrated-test-sofa/docker-compose.yml
index c17534c..7d679d1 100644
--- a/shenyu-integrated-test/shenyu-integrated-test-sofa/docker-compose.yml
+++ b/shenyu-integrated-test/shenyu-integrated-test-sofa/docker-compose.yml
@@ -20,7 +20,7 @@ services:
image: zookeeper:3.5
restart: always
ports:
- - 2181:2181
+ - "2181:2181"
networks:
- shenyu
@@ -31,12 +31,13 @@ services:
networks:
- shenyu
depends_on:
- - shenyu-zk
+ shenyu-zk:
+ condition: service_started
ports:
- - 9095:9095
+ - "9095:9095"
environment:
- SPRING_PROFILES_ACTIVE=h2
- - "shenyu.database.init_script=sql-script/h2/schema.sql"
+ - shenyu.database.init_script=sql-script/h2/schema.sql
healthcheck:
test: ["CMD-SHELL", "wget -q -O -
http://shenyu-admin:9095/actuator/health | grep UP || exit 1"]
timeout: 2s
@@ -60,8 +61,8 @@ services:
retries: 3
start_period: 5s
ports:
- - 28011:28011
- - 8888:8888
+ - "28011:28011"
+ - "8888:8888"
networks:
- shenyu
depends_on:
@@ -82,7 +83,7 @@ services:
shenyu-admin:
condition: service_healthy
ports:
- - 9195:9195
+ - "9195:9195"
healthcheck:
test: [ "CMD", "wget", "-q", "-O", "-",
"http://shenyu-integrated-test-sofa:9195/actuator/health"; ]
timeout: 2s
diff --git
a/shenyu-integrated-test/shenyu-integrated-test-spring-cloud/docker-compose.yml
b/shenyu-integrated-test/shenyu-integrated-test-spring-cloud/docker-compose.yml
index 86f773d..d074c21 100644
---
a/shenyu-integrated-test/shenyu-integrated-test-spring-cloud/docker-compose.yml
+++
b/shenyu-integrated-test/shenyu-integrated-test-spring-cloud/docker-compose.yml
@@ -22,15 +22,16 @@ services:
networks:
- shenyu
ports:
- - 9095:9095
+ - "9095:9095"
environment:
- SPRING_PROFILES_ACTIVE=h2
- - "shenyu.database.init_script=sql-script/h2/schema.sql"
+ - shenyu.database.init_script=sql-script/h2/schema.sql
healthcheck:
- test: ["CMD-SHELL", "wget -q -O -
http://shenyu-admin:9095/actuator/health | grep UP || exit 1"]
+ test: [ "CMD-SHELL", "wget -q -O -
http://shenyu-admin:9095/actuator/health | grep UP || exit 1" ]
timeout: 2s
retries: 3
start_period: 5s
+
shenyu-examples-eureka:
deploy:
resources:
@@ -45,12 +46,13 @@ services:
retries: 3
start_period: 5s
ports:
- - 8761:8761
+ - "8761:8761"
networks:
- shenyu
depends_on:
shenyu-admin:
condition: service_healthy
+
shenyu-examples-springcloud:
deploy:
resources:
@@ -68,13 +70,13 @@ services:
retries: 3
start_period: 5s
ports:
- - 8884:8884
+ - "8884:8884"
networks:
- shenyu
depends_on:
shenyu-integrated-test-spring-cloud:
condition: service_healthy
- # from http plugin dockerfile
+
shenyu-integrated-test-spring-cloud:
container_name: shenyu-integrated-test-spring-cloud
image: apache/shenyu-integrated-test-spring-cloud:latest
@@ -87,10 +89,12 @@ services:
- shenyu.sync.websocket.urls=ws://shenyu-admin:9095/websocket
-
eureka.client.serviceUrl.defaultZone=http://shenyu-examples-eureka:8761/eureka/
depends_on:
- - shenyu-examples-eureka
- - shenyu-admin
+ shenyu-admin:
+ condition: service_healthy
+ shenyu-examples-eureka:
+ condition: service_healthy
ports:
- - 9195:9195
+ - "9195:9195"
healthcheck:
test: [ "CMD", "wget", "-q", "-O", "-",
"http://shenyu-integrated-test-spring-cloud:9195/actuator/health"; ]
timeout: 2s
diff --git
a/shenyu-integrated-test/shenyu-integrated-test-websocket/docker-compose.yml
b/shenyu-integrated-test/shenyu-integrated-test-websocket/docker-compose.yml
index 312383a..84b31e3 100644
--- a/shenyu-integrated-test/shenyu-integrated-test-websocket/docker-compose.yml
+++ b/shenyu-integrated-test/shenyu-integrated-test-websocket/docker-compose.yml
@@ -22,10 +22,10 @@ services:
networks:
- shenyu
ports:
- - 9095:9095
+ - "9095:9095"
environment:
- SPRING_PROFILES_ACTIVE=h2
- - "shenyu.database.init_script=sql-script/h2/schema.sql"
+ - shenyu.database.init_script=sql-script/h2/schema.sql
healthcheck:
test: ["CMD-SHELL", "wget -q -O -
http://shenyu-admin:9095/actuator/health | grep UP || exit 1"]
timeout: 2s
@@ -48,8 +48,8 @@ services:
retries: 3
start_period: 5s
ports:
- - 28011:28011
- - 8888:8888
+ - "28011:28011"
+ - "8888:8888"
networks:
- shenyu
depends_on:
@@ -70,7 +70,7 @@ services:
shenyu-admin:
condition: service_healthy
ports:
- - 9195:9195
+ - "9195:9195"
healthcheck:
test: [ "CMD", "wget", "-q", "-O", "-",
"http://shenyu-integrated-test-websocket:9195/actuator/health"; ]
timeout: 2s
diff --git
a/shenyu-integrated-test/shenyu-integration-test-alibaba-dubbo/docker-compose.yml
b/shenyu-integrated-test/shenyu-integration-test-alibaba-dubbo/docker-compose.yml
index 6a4c49e..63f4146 100644
---
a/shenyu-integrated-test/shenyu-integration-test-alibaba-dubbo/docker-compose.yml
+++
b/shenyu-integrated-test/shenyu-integration-test-alibaba-dubbo/docker-compose.yml
@@ -21,6 +21,7 @@ services:
restart: always
networks:
- shenyu
+
shenyu-admin:
image: apache/shenyu-admin:latest
container_name: shenyu-admin
@@ -31,12 +32,13 @@ services:
- "9095:9095"
environment:
- SPRING_PROFILES_ACTIVE=h2
- - "shenyu.database.init_script=sql-script/h2/schema.sql"
+ - shenyu.database.init_script=sql-script/h2/schema.sql
healthcheck:
test: ["CMD-SHELL", "wget -q -O -
http://shenyu-admin:9095/actuator/health | grep UP || exit 1"]
timeout: 2s
retries: 3
start_period: 5s
+
shenyu-examples-alibaba-dubbo-service:
deploy:
resources:
@@ -61,6 +63,7 @@ services:
environment:
- dubbo.zk=zookeeper://shenyu-zk:2181
- shenyu.register.serverLists=http://shenyu-admin:9095
+
shenyu-integration-test-alibaba-dubbo:
container_name: shenyu-integration-test-alibaba-dubbo
image: apache/shenyu-integration-test-alibaba-dubbo:latest
diff --git
a/shenyu-integrated-test/shenyu-integration-test-apache-dubbo/docker-compose.yml
b/shenyu-integrated-test/shenyu-integration-test-apache-dubbo/docker-compose.yml
index 4d7f636..b804ce9 100644
---
a/shenyu-integrated-test/shenyu-integration-test-apache-dubbo/docker-compose.yml
+++
b/shenyu-integrated-test/shenyu-integration-test-apache-dubbo/docker-compose.yml
@@ -23,6 +23,7 @@ services:
- shenyu
ports:
- "2181:2181"
+
shenyu-admin:
image: apache/shenyu-admin:latest
container_name: shenyu-admin
@@ -33,12 +34,13 @@ services:
- "9095:9095"
environment:
- SPRING_PROFILES_ACTIVE=h2
- - "shenyu.database.init_script=sql-script/h2/schema.sql"
+ - shenyu.database.init_script=sql-script/h2/schema.sql
healthcheck:
test: ["CMD-SHELL", "wget -q -O -
http://shenyu-admin:9095/actuator/health | grep UP || exit 1"]
timeout: 2s
retries: 3
start_period: 5s
+
shenyu-examples-apache-dubbo-service:
deploy:
resources:
@@ -63,6 +65,7 @@ services:
environment:
- dubbo.registry.address=zookeeper://shenyu-zk:2181
- shenyu.register.serverLists=http://shenyu-admin:9095
+
shenyu-integration-test-apache-dubbo:
container_name: shenyu-integration-test-apache-dubbo
image: apache/shenyu-integration-test-apache-dubbo:latest
