You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ni...@apache.org on 2018/09/11 06:08:41 UTC
[incubator-servicecomb-saga] 04/07: SCB-820 Updated the docker
compose file
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/incubator-servicecomb-saga.git
commit a928a267efe00195cf5b036aebefbd9d5fc5570c
Author: Willem Jiang <ji...@huawei.com>
AuthorDate: Mon Sep 10 16:47:13 2018 +0800
SCB-820 Updated the docker compose file
---
saga-demo/tcc-spring-demo/docker-compose-demo.yaml | 30 ++++++++++++----------
saga-demo/tcc-spring-demo/docker-compose.yaml | 30 ++++++++++++----------
.../ordering/src/main/resources/application.yaml | 2 --
.../payment/src/main/resources/application.yaml | 2 --
saga-demo/tcc-spring-demo/saga-demo.sh | 2 +-
5 files changed, 35 insertions(+), 31 deletions(-)
diff --git a/saga-demo/tcc-spring-demo/docker-compose-demo.yaml b/saga-demo/tcc-spring-demo/docker-compose-demo.yaml
index 2fcf1a1..0c988af 100644
--- a/saga-demo/tcc-spring-demo/docker-compose-demo.yaml
+++ b/saga-demo/tcc-spring-demo/docker-compose-demo.yaml
@@ -18,31 +18,35 @@
version: '2.1'
services:
- hotel:
- image: "hotel:${TAG}"
- hostname: hotel
+ payment:
+ image: "tcc-payment:${TAG}"
+ hostname: payment
external_links:
- "alpha:alpha-server.servicecomb.io"
+ environment:
+ - JAVA_OPTS=-Dspring.profiles.active=prd
ports:
- "8081:8080"
- car:
- image: "car:${TAG}"
- hostname: car
+ inventory:
+ image: "tcc-inventory:${TAG}"
+ hostname: inventory
external_links:
- "alpha:alpha-server.servicecomb.io"
+ environment:
+ - JAVA_OPTS=-Dspring.profiles.active=prd
ports:
- "8082:8080"
- booking:
- image: "booking:${TAG}"
- hostname: booking
+ ordering:
+ image: "tcc-ordering:${TAG}"
+ hostname: ordering
external_links:
- "alpha:alpha-server.servicecomb.io"
- - "hotel:hotel.servicecomb.io"
- - "car:car.servicecomb.io"
+ - "payment:payment.servicecomb.io"
+ - "inventory:inventory.servicecomb.io"
ports:
- "8083:8080"
depends_on:
- - hotel
- - car
+ - payment
+ - inventory
diff --git a/saga-demo/tcc-spring-demo/docker-compose.yaml b/saga-demo/tcc-spring-demo/docker-compose.yaml
index 38e48f1..faa3d5f 100644
--- a/saga-demo/tcc-spring-demo/docker-compose.yaml
+++ b/saga-demo/tcc-spring-demo/docker-compose.yaml
@@ -47,37 +47,41 @@ services:
database:
condition: service_healthy
- hotel:
- image: "hotel:${TAG}"
- hostname: hotel
+ payment:
+ image: "tcc-payment:${TAG}"
+ hostname: payment
links:
- "alpha:alpha-server.servicecomb.io"
+ environment:
+ - JAVA_OPTS=-Dspring.profiles.active=prd
ports:
- "8081:8080"
depends_on:
alpha:
condition: service_healthy
- car:
- image: "car:${TAG}"
- hostname: car
+ inventory:
+ image: "tcc-inventory:${TAG}"
+ hostname: inventory
links:
- "alpha:alpha-server.servicecomb.io"
+ environment:
+ - JAVA_OPTS=-Dspring.profiles.active=prd
ports:
- "8082:8080"
depends_on:
alpha:
condition: service_healthy
- booking:
- image: "booking:${TAG}"
- hostname: booking
+ ordering:
+ image: "tcc-ordering:${TAG}"
+ hostname: ordering
links:
- "alpha:alpha-server.servicecomb.io"
- - "hotel:hotel.servicecomb.io"
- - "car:car.servicecomb.io"
+ - "inventory:inventory.servicecomb.io"
+ - "payment:payment.servicecomb.io"
ports:
- "8083:8080"
depends_on:
- - hotel
- - car
+ - payment
+ - inventory
diff --git a/saga-demo/tcc-spring-demo/ordering/src/main/resources/application.yaml b/saga-demo/tcc-spring-demo/ordering/src/main/resources/application.yaml
index 57785f5..028de4e 100644
--- a/saga-demo/tcc-spring-demo/ordering/src/main/resources/application.yaml
+++ b/saga-demo/tcc-spring-demo/ordering/src/main/resources/application.yaml
@@ -33,5 +33,3 @@ spring:
alpha:
cluster:
address: alpha-server.servicecomb.io:8080
-server:
- port: 10010
\ No newline at end of file
diff --git a/saga-demo/tcc-spring-demo/payment/src/main/resources/application.yaml b/saga-demo/tcc-spring-demo/payment/src/main/resources/application.yaml
index 7fe65b3..474a8df 100644
--- a/saga-demo/tcc-spring-demo/payment/src/main/resources/application.yaml
+++ b/saga-demo/tcc-spring-demo/payment/src/main/resources/application.yaml
@@ -33,5 +33,3 @@ spring:
alpha:
cluster:
address: alpha-server.servicecomb.io:8080
-server:
- port: 10030
\ No newline at end of file
diff --git a/saga-demo/tcc-spring-demo/saga-demo.sh b/saga-demo/tcc-spring-demo/saga-demo.sh
old mode 100644
new mode 100755
index 2b3cf47..a94a36e
--- a/saga-demo/tcc-spring-demo/saga-demo.sh
+++ b/saga-demo/tcc-spring-demo/saga-demo.sh
@@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-service=saga-demo
+service=tcc-spring-demo
show_usage() {
echo "Usage: $0 {up|up-alpha|up-demo|up-mysql|down}" >&2