fixbugs

templates/openresty/Dockerfile

@@ -11,15 +11,13 @@ ENV BRANCH_NAME=$BRANCH_NAME
 
 USER root
 WORKDIR /home/quant_group
-RUN mkdir project
 
 RUN echo "BUILD_NUMBER: ${BUILD_NUMBER},SYSTEM_NAME: ${SYSTEM_NAME},BRANCH_NAME: ${BRANCH_NAME}" >> ./build_info
 
 EXPOSE 80
 
 COPY docker-entrypoint.sh .
-COPY dist.tgz ./project/dist.tgz
-COPY default.conf /usr/local/openresty/nginx/conf.d/default.conf
+COPY *dist.tgz .
 
 RUN chmod +x ./docker-entrypoint.sh
 

templates/openresty/docker-entrypoint.sh

 #!/bin/sh
 echo "deploy openresty"
-module_name='project'
-package_path="/home/quant_group/${module_name}"
+package_path="/home/quant_group"
 
 echo "cd ${package_path}"
 cd ${package_path}
 
-echo "mkdir -p public"
-mkdir -p ${package_path}/public
-
-echo "rm public/* -rf"
-rm ${package_path}/public/* -rf
-
-echo "tar zxf dist.tgz  -C ${package_path}/public"
-tar zxf ${package_path}/dist.tgz  -C ${package_path}/public
-
-echo "mv public/dist/* public"
-mv ${package_path}/public/dist/* public
-
-echo "rm dist.tgz public/dist -rf"
-rm ${package_path}/dist.tgz ${package_path}/public/dist -rf
+for entry in ./*.tgz
+do
+    echo "tar zxf ${$entry} -C ${package_path}"
+    tar zxf ${package_path}/$entry  -C ${package_path}
+done
 
 echo "/usr/bin/openresty -g 'daemon off;'"
 /usr/bin/openresty -g 'daemon off;'
\ No newline at end of file