This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git
commit b683aa964a93cf9617691c096fb177fad38ac0da
Author: Daniel Qian <chanjars...@gmail.com>
AuthorDate: Sun Jun 30 10:47:24 2019 +0800
SCB-1335 upgrade docker-compose file from 2.1 to 3.0
---
demo/saga-dubbo-demo/docker-compose-alpha.yaml | 5 ++---
demo/saga-dubbo-demo/docker-compose-demo.yaml | 2 +-
demo/saga-dubbo-demo/docker-compose.mysql.yaml | 14 +++++---------
demo/saga-dubbo-demo/docker-compose.yaml | 14 +++++---------
demo/saga-servicecomb-demo/docker-compose.yaml | 11 ++++-------
demo/saga-spring-demo/docker-compose-alpha-perf.yaml | 5 ++---
demo/saga-spring-demo/docker-compose-alpha.yaml | 5 ++---
demo/saga-spring-demo/docker-compose-demo.yaml | 2 +-
demo/saga-spring-demo/docker-compose.mysql.yaml | 2 +-
demo/saga-spring-demo/docker-compose.yaml | 11 ++++-------
demo/tcc-spring-demo/docker-compose-alpha.yaml | 5 ++---
demo/tcc-spring-demo/docker-compose-demo.yaml | 2 +-
demo/tcc-spring-demo/docker-compose.mysql.yaml | 2 +-
demo/tcc-spring-demo/docker-compose.yaml | 11 ++++-------
14 files changed, 35 insertions(+), 56 deletions(-)
diff --git a/demo/saga-dubbo-demo/docker-compose-alpha.yaml
b/demo/saga-dubbo-demo/docker-compose-alpha.yaml
index a664c23..6041c38 100644
--- a/demo/saga-dubbo-demo/docker-compose-alpha.yaml
+++ b/demo/saga-dubbo-demo/docker-compose-alpha.yaml
@@ -15,7 +15,7 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-version: '2.1'
+version: '3.0'
services:
database:
@@ -44,5 +44,4 @@ services:
timeout: 10s
retries: 5
depends_on:
- database:
- condition: service_healthy
+ - database
diff --git a/demo/saga-dubbo-demo/docker-compose-demo.yaml
b/demo/saga-dubbo-demo/docker-compose-demo.yaml
index 2890ced..cd46500 100644
--- a/demo/saga-dubbo-demo/docker-compose-demo.yaml
+++ b/demo/saga-dubbo-demo/docker-compose-demo.yaml
@@ -15,7 +15,7 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-version: '2.1'
+version: '3.0'
services:
zookeeper:
diff --git a/demo/saga-dubbo-demo/docker-compose.mysql.yaml
b/demo/saga-dubbo-demo/docker-compose.mysql.yaml
index 6e0fcb7..e4d515e 100644
--- a/demo/saga-dubbo-demo/docker-compose.mysql.yaml
+++ b/demo/saga-dubbo-demo/docker-compose.mysql.yaml
@@ -18,7 +18,7 @@
##
#you need to add mysql drive to alpha pom.xml and saga-dubbo-demo pom.xml first
##
-version: '2.1'
+version: '3.0'
services:
@@ -56,8 +56,7 @@ services:
timeout: 10s
retries: 5
depends_on:
- database:
- condition: service_healthy
+ - database
servicea:
image: "servicea:${TAG}"
@@ -78,8 +77,7 @@ services:
ports:
- "8071:8071"
depends_on:
- alpha:
- condition: service_healthy
+ - alpha
serviceb:
image: "serviceb:${TAG}"
@@ -100,8 +98,7 @@ services:
ports:
- "8072:8072"
depends_on:
- alpha:
- condition: service_healthy
+ - alpha
servicec:
image: "servicec:${TAG}"
@@ -122,6 +119,5 @@ services:
ports:
- "8073:8073"
depends_on:
- alpha:
- condition: service_healthy
+ - alpha
diff --git a/demo/saga-dubbo-demo/docker-compose.yaml
b/demo/saga-dubbo-demo/docker-compose.yaml
index 3510f86..2529776 100644
--- a/demo/saga-dubbo-demo/docker-compose.yaml
+++ b/demo/saga-dubbo-demo/docker-compose.yaml
@@ -15,7 +15,7 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-version: '2.1'
+version: '3.0'
services:
@@ -56,8 +56,7 @@ services:
timeout: 10s
retries: 5
depends_on:
- database:
- condition: service_healthy
+ - database
servicea:
image: "servicea:${TAG}"
@@ -78,8 +77,7 @@ services:
ports:
- "8071:8071"
depends_on:
- alpha:
- condition: service_healthy
+ - alpha
serviceb:
image: "serviceb:${TAG}"
@@ -100,8 +98,7 @@ services:
ports:
- "8072:8072"
depends_on:
- alpha:
- condition: service_healthy
+ - alpha
servicec:
image: "servicec:${TAG}"
@@ -122,5 +119,4 @@ services:
ports:
- "8073:8073"
depends_on:
- alpha:
- condition: service_healthy
+ - alpha
diff --git a/demo/saga-servicecomb-demo/docker-compose.yaml
b/demo/saga-servicecomb-demo/docker-compose.yaml
index 88b4e24..7450473 100644
--- a/demo/saga-servicecomb-demo/docker-compose.yaml
+++ b/demo/saga-servicecomb-demo/docker-compose.yaml
@@ -15,7 +15,7 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-version: '2.1'
+version: '3.0'
services:
database:
@@ -46,8 +46,7 @@ services:
timeout: 10s
retries: 5
depends_on:
- database:
- condition: service_healthy
+ - database
servicecenter:
image: "servicecomb/service-center:latest"
@@ -64,8 +63,7 @@ services:
ports:
- "8081:8081"
depends_on:
- alpha:
- condition: service_healthy
+ - alpha
car:
image: "scb-car:${TAG}"
@@ -76,8 +74,7 @@ services:
ports:
- "8082:8082"
depends_on:
- alpha:
- condition: service_healthy
+ - alpha
booking:
image: "scb-booking:${TAG}"
diff --git a/demo/saga-spring-demo/docker-compose-alpha-perf.yaml
b/demo/saga-spring-demo/docker-compose-alpha-perf.yaml
index 7b094b7..7a1ae2b 100644
--- a/demo/saga-spring-demo/docker-compose-alpha-perf.yaml
+++ b/demo/saga-spring-demo/docker-compose-alpha-perf.yaml
@@ -15,7 +15,7 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-version: '2.1'
+version: '3.0'
services:
database:
@@ -45,8 +45,7 @@ services:
timeout: 10s
retries: 5
depends_on:
- database:
- condition: service_healthy
+ - database
grafana:
image: "kamon/grafana_graphite"
diff --git a/demo/saga-spring-demo/docker-compose-alpha.yaml
b/demo/saga-spring-demo/docker-compose-alpha.yaml
index a664c23..6041c38 100644
--- a/demo/saga-spring-demo/docker-compose-alpha.yaml
+++ b/demo/saga-spring-demo/docker-compose-alpha.yaml
@@ -15,7 +15,7 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-version: '2.1'
+version: '3.0'
services:
database:
@@ -44,5 +44,4 @@ services:
timeout: 10s
retries: 5
depends_on:
- database:
- condition: service_healthy
+ - database
diff --git a/demo/saga-spring-demo/docker-compose-demo.yaml
b/demo/saga-spring-demo/docker-compose-demo.yaml
index 2fcf1a1..3c0e4f6 100644
--- a/demo/saga-spring-demo/docker-compose-demo.yaml
+++ b/demo/saga-spring-demo/docker-compose-demo.yaml
@@ -15,7 +15,7 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-version: '2.1'
+version: '3.0'
services:
hotel:
diff --git a/demo/saga-spring-demo/docker-compose.mysql.yaml
b/demo/saga-spring-demo/docker-compose.mysql.yaml
index 43f3b5e..3cc3154 100644
--- a/demo/saga-spring-demo/docker-compose.mysql.yaml
+++ b/demo/saga-spring-demo/docker-compose.mysql.yaml
@@ -15,7 +15,7 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-version: '2.1'
+version: '3.0'
services:
database:
diff --git a/demo/saga-spring-demo/docker-compose.yaml
b/demo/saga-spring-demo/docker-compose.yaml
index 38e48f1..ac70522 100644
--- a/demo/saga-spring-demo/docker-compose.yaml
+++ b/demo/saga-spring-demo/docker-compose.yaml
@@ -15,7 +15,7 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-version: '2.1'
+version: '3.0'
services:
database:
@@ -44,8 +44,7 @@ services:
timeout: 10s
retries: 5
depends_on:
- database:
- condition: service_healthy
+ - database
hotel:
image: "hotel:${TAG}"
@@ -55,8 +54,7 @@ services:
ports:
- "8081:8080"
depends_on:
- alpha:
- condition: service_healthy
+ - alpha
car:
image: "car:${TAG}"
@@ -66,8 +64,7 @@ services:
ports:
- "8082:8080"
depends_on:
- alpha:
- condition: service_healthy
+ - alpha
booking:
image: "booking:${TAG}"
diff --git a/demo/tcc-spring-demo/docker-compose-alpha.yaml
b/demo/tcc-spring-demo/docker-compose-alpha.yaml
index a664c23..6041c38 100644
--- a/demo/tcc-spring-demo/docker-compose-alpha.yaml
+++ b/demo/tcc-spring-demo/docker-compose-alpha.yaml
@@ -15,7 +15,7 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-version: '2.1'
+version: '3.0'
services:
database:
@@ -44,5 +44,4 @@ services:
timeout: 10s
retries: 5
depends_on:
- database:
- condition: service_healthy
+ - database
diff --git a/demo/tcc-spring-demo/docker-compose-demo.yaml
b/demo/tcc-spring-demo/docker-compose-demo.yaml
index 0c988af..2c7fe4a 100644
--- a/demo/tcc-spring-demo/docker-compose-demo.yaml
+++ b/demo/tcc-spring-demo/docker-compose-demo.yaml
@@ -15,7 +15,7 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-version: '2.1'
+version: '3.0'
services:
payment:
diff --git a/demo/tcc-spring-demo/docker-compose.mysql.yaml
b/demo/tcc-spring-demo/docker-compose.mysql.yaml
index 43f3b5e..3cc3154 100644
--- a/demo/tcc-spring-demo/docker-compose.mysql.yaml
+++ b/demo/tcc-spring-demo/docker-compose.mysql.yaml
@@ -15,7 +15,7 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-version: '2.1'
+version: '3.0'
services:
database:
diff --git a/demo/tcc-spring-demo/docker-compose.yaml
b/demo/tcc-spring-demo/docker-compose.yaml
index faa3d5f..b33be54 100644
--- a/demo/tcc-spring-demo/docker-compose.yaml
+++ b/demo/tcc-spring-demo/docker-compose.yaml
@@ -15,7 +15,7 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-version: '2.1'
+version: '3.0'
services:
database:
@@ -44,8 +44,7 @@ services:
timeout: 10s
retries: 5
depends_on:
- database:
- condition: service_healthy
+ - database
payment:
image: "tcc-payment:${TAG}"
@@ -57,8 +56,7 @@ services:
ports:
- "8081:8080"
depends_on:
- alpha:
- condition: service_healthy
+ - alpha
inventory:
image: "tcc-inventory:${TAG}"
@@ -70,8 +68,7 @@ services:
ports:
- "8082:8080"
depends_on:
- alpha:
- condition: service_healthy
+ - alpha
ordering:
image: "tcc-ordering:${TAG}"
