fix start.sh

Author: cyjseagull

docker-files/site/Dockerfile

@@ -66,4 +66,4 @@ COPY --from=builder /WeDPR/wedpr-site/dist/ /data/home/wedpr/wedpr-site
 # copy the web package
 COPY --from=web_builder /WeDPR/wedpr-web/dist /data/home/wedpr/wedpr-site/web
 
-ENTRYPOINT ["/bin/bash", "/data/home/wedpr/wedpr-site/start.sh", "true", "&&", "/usr/sbin/nginx"]
+ENTRYPOINT ["/usr/sbin/nginx","&&", "/bin/bash", "/data/home/wedpr/wedpr-site/start.sh", "true"]

wedpr-builder/wedpr_builder/tpl/nginx/nginx.conf

@@ -67,6 +67,4 @@ server {
 	error_log /var/log/nginx/error.log;
 	include /etc/nginx/conf.d/*.conf;
 	include /etc/nginx/sites-enabled/*;
-}
-
-daemon off;
+}

wedpr-pir/bin/start.sh

@@ -13,6 +13,13 @@ STATUS_STARTING="Starting"
 STATUS_RUNNING="Running"
 STATUS_STOPPED="Stopped"
 start_success_log="start.*success"
+ENABLE_DOCKER_MODE="false"
+
+start_log="start.out"
+if [ "$ENABLE_DOCKER_MODE" = "true" ]; then
+  start_log="logs/start.out"
+fi
+
 
 JAVA_CMD=$JAVA_HOME/bin/java
 if [ ! -f "${JAVA_HOME}" ];then
@@ -46,13 +53,17 @@ JAVA_OPTS+=" -DserviceConfigPath=${CONFIG_PATH}"
 
 run_app()
 {
-    nohup $JAVA_CMD $JAVA_OPTS -cp $CLASSPATH $APP_MAIN > start.out 2>&1 &
+    if [ "$ENABLE_DOCKER_MODE" = "true" ]; then
+      exec ${JAVA_CMD} $JAVA_OPTS -cp $CLASSPATH $APP_MAIN > ${start_log} 2>&1
+    else
+      nohup $JAVA_CMD $JAVA_OPTS -cp $CLASSPATH $APP_MAIN > ${start_log} 2>&1 &
+    fi
 }
 
 app_status()
 {
     if [ ! -z "$(app_pid)" ]; then
-        if [ ! -z "$(grep -i "${start_success_log}" start.out)" ]; then
+        if [ ! -z "$(grep -i "${start_success_log}" ${start_log})" ]; then
             echo ${STATUS_RUNNING}
         else
             echo ${STATUS_STARTING}
@@ -84,7 +95,7 @@ before_start()
 }
 
 start(){
-    rm -f start.out
+    rm -f ${start_log}
     run_app
     LOG_INFO "${APP_MAIN} booting up .."
     try_times=45

wedpr-site/bin/start.sh

@@ -11,6 +11,12 @@ STATUS_STARTING="Starting"
 STATUS_RUNNING="Running"
 STATUS_STOPPED="Stopped"
 start_success_log="start.*success"
+ENABLE_DOCKER_MODE="false"
+
+start_log="start.out"
+if [ "$ENABLE_DOCKER_MODE" = "true" ]; then
+  start_log="logs/start.out"
+fi
 
 
 JAVA_CMD=$JAVA_HOME/bin/java
@@ -44,13 +50,17 @@ JAVA_OPTS+=" -DserviceName=${SERVER_NAME}"
 JAVA_OPTS+=" -DserviceConfigPath=${CONFIG_PATH}"
 run_app()
 {
-    nohup ${JAVA_CMD} $JAVA_OPTS -cp $CLASSPATH $APP_MAIN > start.out 2>&1 &
+      if [ "$ENABLE_DOCKER_MODE" = "true" ]; then
+          exec ${JAVA_CMD} $JAVA_OPTS -cp $CLASSPATH $APP_MAIN > ${start_log} 2>&1
+      else
+        nohup ${JAVA_CMD} $JAVA_OPTS -cp $CLASSPATH $APP_MAIN > ${start_log} 2>&1 &
+     fi
 }
 
 app_status()
 {
     if [ ! -z "$(app_pid)" ]; then
-        if [ ! -z "$(grep -i "${start_success_log}" start.out)" ]; then
+        if [ ! -z "$(grep -i "${start_success_log}" ${start_log})" ]; then
             echo ${STATUS_RUNNING}
         else
             echo ${STATUS_STARTING}
@@ -82,7 +92,7 @@ before_start()
 }
 
 start(){
-    rm -f start.out
+    rm -f ${start_log}
     run_app
     LOG_INFO "${APP_MAIN} booting up .."
     try_times=45

wedpr-worker/bin/start.sh

@@ -15,10 +15,11 @@ STATUS_STOPPED="Stopped"
 start_success_log="start.*success"
 ENABLE_DOCKER_MODE="false"
 
-#if [ "${JAVA_HOME}" = "" ];then
-#    JAVA_HOME=/nemo/jdk8u382-b05
-#    echo "JAVA_HOME has not been configured, set  to default: ${JAVA_HOME}"
-#fi
+start_log="start.out"
+if [ "$ENABLE_DOCKER_MODE" = "true" ]; then
+  start_log="logs/start.out"
+fi
+
 
 JAVA_CMD=$JAVA_HOME/bin/java
 if [ ! -f "${JAVA_HOME}" ];then
@@ -51,16 +52,16 @@ JAVA_OPTS+=" -DserviceConfigPath=${CONFIG_PATH}"
 run_app()
 {
     if [ "$ENABLE_DOCKER_MODE" = "true" ]; then
-        exec ${JAVA_CMD} $JAVA_OPTS -cp $CLASSPATH $APP_MAIN > start.out 2>&1
+        exec ${JAVA_CMD} $JAVA_OPTS -cp $CLASSPATH $APP_MAIN > ${start_log}  2>&1
     else
-        nohup ${JAVA_CMD} $JAVA_OPTS -cp $CLASSPATH $APP_MAIN > start.out 2>&1 &
+        nohup ${JAVA_CMD} $JAVA_OPTS -cp $CLASSPATH $APP_MAIN > ${start_log} 2>&1 &
     fi
 }
 
 app_status()
 {
     if [ ! -z "$(app_pid)" ]; then
-        if [ ! -z "$(grep -i "${start_success_log}" start.out)" ]; then
+        if [ ! -z "$(grep -i "${start_success_log}" ${start_log})" ]; then
             echo ${STATUS_RUNNING}
         else
             echo ${STATUS_STARTING}
@@ -92,7 +93,7 @@ before_start()
 }
 
 start(){
-    rm -f start.out
+    rm -f ${start_log}
     run_app
     LOG_INFO "${APP_MAIN} booting up .."
     try_times=45