[GitHub] little-cui closed pull request #427: SCB-862 Using different environment variables in image

[GitBox <gi...@apache.org>]

little-cui closed pull request #427: SCB-862 Using different environment variables in image
URL: https://github.com/apache/incubator-servicecomb-service-center/pull/427
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/docker-compose.yml b/docker-compose.yml
index 6a9ec642..9a9a01dc 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 6fd50b74..964837ef 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 d2537994..f1ca9cf3 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 532ddaff..144ceaee 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 3163dd00..b634a392 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#*:}
 


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services