You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2018/08/23 01:55:23 UTC
[incubator-servicecomb-service-center] branch master updated: Docker hub 中的service center 镜像说明需要优化 (#427)
This is an automated email from the ASF dual-hosted git repository.
littlecui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-service-center.git
The following commit(s) were added to refs/heads/master by this push:
new ed50817 Docker hub 中的service center 镜像说明需要优化 (#427)
ed50817 is described below
commit ed50817600d4fcbf7b3fb08bb18ee83a7ef74cbc
Author: little-cui <su...@qq.com>
AuthorDate: Thu Aug 23 09:55:21 2018 +0800
Docker hub 中的service center 镜像说明需要优化 (#427)
---
docker-compose.yml | 2 +-
integration/docker/docker-compose.yml | 2 +-
integration/k8s/service-center/templates/deployment.yaml | 2 +-
scripts/docker/build-frontend-image/README.md | 4 ++--
scripts/docker/build-frontend-image/start.sh | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index 6a9ec64..9a9a01d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -30,4 +30,4 @@ services:
ports:
- "30103:30103"
environment:
- BACKEND_ADDRESS: http://service-center:30100
+ SC_ADDRESS: http://service-center:30100
diff --git a/integration/docker/docker-compose.yml b/integration/docker/docker-compose.yml
index 6fd50b7..964837e 100644
--- a/integration/docker/docker-compose.yml
+++ b/integration/docker/docker-compose.yml
@@ -48,6 +48,6 @@ services:
ports:
- "30103:30103"
environment:
- BACKEND_ADDRESS: http://service-center:30100
+ SC_ADDRESS: http://service-center:30100
volumes:
grafana_data:
diff --git a/integration/k8s/service-center/templates/deployment.yaml b/integration/k8s/service-center/templates/deployment.yaml
index d253799..f1ca9cf 100644
--- a/integration/k8s/service-center/templates/deployment.yaml
+++ b/integration/k8s/service-center/templates/deployment.yaml
@@ -67,7 +67,7 @@ spec:
ports:
- containerPort: {{ .Values.frontend.service.internalPort }}
env:
- - name: BACKEND_ADDRESS
+ - name: SC_ADDRESS
value: http://{{ $serviceName }}:{{ $servicePort }}
livenessProbe:
httpGet:
diff --git a/scripts/docker/build-frontend-image/README.md b/scripts/docker/build-frontend-image/README.md
index 532ddaf..144ceae 100644
--- a/scripts/docker/build-frontend-image/README.md
+++ b/scripts/docker/build-frontend-image/README.md
@@ -12,11 +12,11 @@ Then build docker image of frontend from folder "PROJECT_ROOT/scripts/docker/bui
Once the script finishes you will see image scfrontend-dev.tgz in the same directory. You can use this this image to load the docker and start using. Run following command, open Web Browser and connect to URL "http://<HOST_IP>:30103" to view frontend UI.
- docker run -d -p 30103:30103 -e BACKEND_ADDRESS=${BACKEND_ADDRESS} -t servicecomb/scfrontend
+ docker run -d -p 30103:30103 -e SC_ADDRESS=${SC_ADDRESS} -t servicecomb/scfrontend
Where HOST_IP is the ip of host machine where docker container for frontend is executing.
Note:
1. The same image can be used to deploy in Huawei Public Cloud using CFE/CCE or just deploy in a VM.
-1. Configuring BACKEND_ADDRESS will enable you to setup the EIP of the Service-center.
+1. Configuring SC_ADDRESS will enable you to setup the EIP of the service-center.
diff --git a/scripts/docker/build-frontend-image/start.sh b/scripts/docker/build-frontend-image/start.sh
index 3163dd0..b634a39 100644
--- a/scripts/docker/build-frontend-image/start.sh
+++ b/scripts/docker/build-frontend-image/start.sh
@@ -23,7 +23,7 @@ cd /opt/frontend
sed -i "s/^frontend_host_ip.*=.*$/frontend_host_ip = $(hostname)/g" conf/app.conf
-sc_ip_port=${BACKEND_ADDRESS#*//}
+sc_ip_port=${SC_ADDRESS#*//}
sc_ip=${sc_ip_port%:*}
sc_port=${sc_ip_port#*:}