$NAMESPACE

templates/java/docker-entrypoint.sh

@@ -4,11 +4,11 @@ module_name=project
 package_path="./${module_name}/app.jar"
 config_path="./${module_name}/application.properties"
 
-namespace=`cat /var/run/secrets/kubernetes.io/serviceaccount/namespace`
-echo "namespace is $namespace"
-sed -i "s/.xyqb.com/-$namespace.q-gp.com/g" ${config_path}
+export NAMESPACE=`cat /var/run/secrets/kubernetes.io/serviceaccount/namespace`
+echo "NAMESPACE is $NAMESPACE"
+sed -i "s/.xyqb.com/-$NAMESPACE.q-gp.com/g" ${config_path}
 
-sed -i "s/xterm.js demo/${SYSTEM_NAME}@${namespace}/"  /home/qg-xterm/demo/index.html
+sed -i "s/xterm.js demo/${SYSTEM_NAME}@${NAMESPACE}/"  /home/qg-xterm/demo/index.html
 
 echo "java -Xmx512m -XX:PermSize64m -Xloggc:/tmp/${module_name}_gc.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 -Denv=dev -Didc=k8s -Dtest=true -jar ${package_path} --worker 1 --currentWorker 1 -t --server.port=80 --spring.config.location=${config_path} -Djava.security.egd=file:/dev/./urandom" > java_command
 nohup java -Xmx512m -XX:PermSize64m -Xloggc:/tmp/${module_name}_gc.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 -Denv=dev -Didc=k8s -Dtest=true -jar ${package_path} --worker 1 --currentWorker 1 -t --server.port=80 --spring.config.location=${config_path} -Djava.security.egd=file:/dev/./urandom &

templates/ui-openresty/Dockerfile

 FROM 192.168.4.36/baseimg/openresty:12251535
 MAINTAINER kalvin "dekun.dai@quantgroup.cn"
 
-ARG SYSTEM_NAME
-ARG BUILD_NUMBER
+ARG BUILD_NUMBER 
+ARG SYSTEM_NAME  
+ARG BRANCH_NAME
+
+ENV BUILD_NUMBER=$BUILD_NUMBER
+ENV SYSTEM_NAME=$SYSTEM_NAME
+ENV BRANCH_NAME=$BRANCH_NAME
 
 USER root
-ENV SYSTEM_NAME=${SYSTEM_NAME}
 WORKDIR /home/quant_group
 RUN mkdir ${SYSTEM_NAME}