Update portal port

voole · May 17, 2016 · f562a85 · f562a85
1 parent 0702ffc
commit f562a85
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/apollo-assembly/src/main/java/com/ctrip/apollo/assembly/ApolloApplication.java b/apollo-assembly/src/main/java/com/ctrip/apollo/assembly/ApolloApplication.java
@@ -51,6 +51,8 @@ public static void main(String[] args) throws Exception {
 
     /**
      * Portal
+     * 
+     * WARNING: Do not start portal at the same pool as configservice, they will conflict on 8080
      */
     if (commonContext.getEnvironment().containsProperty("portal")) {
       ConfigurableApplicationContext portalContext =

diff --git a/apollo-assembly/src/main/scripts/services.sh b/apollo-assembly/src/main/scripts/services.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-SERVICES='--configservice --adminservice --portal'
+SERVICES='--configservice --adminservice'
diff --git a/apollo-buildtools/src/main/scripts/deploy_jenkins.sh b/apollo-buildtools/src/main/scripts/deploy_jenkins.sh
@@ -33,6 +33,8 @@ APP_SHUTDOWN_SCRIPT=$APP_DIR/scripts/shutdown.sh
 chmod +x $APP_SHUTDOWN_SCRIPT
 if [ -e $APP_STARTUP_SCRIPT ];then
 	$APP_SHUTDOWN_SCRIPT
+	echo "Sleeping 5s to wait shutting down"
+	sleep 5s
 fi
 
 mkdir -p $APP_RELEASE_DIR

diff --git a/apollo-portal/src/main/resources/portal.properties b/apollo-portal/src/main/resources/portal.properties
@@ -1,5 +1,5 @@
 spring.application.name= apollo-portal
 apollo.portal.env= dev,fat,uat
 ctrip.appid= 100003173
-server.port= 8070
+server.port= 8080
 logging.file= /opt/logs/100003173/apollo-portal.log