Merge branch 'master' of git.quantgroup.cn:QA/qg-dockerfiles

Conflicts:
	templates/lua-ui/Dockerfile

templates/lua-ui/Dockerfile

@@ -7,6 +7,7 @@ RUN mkdir -p /usr/local/openresty/nginx/conf/conf.d/;mkdir -p /usr/local/openres
 ENV NODE_ENV=test
 
 ARG BUILD_SCHEMA
+ARG SYSTEM_NAME
 ENV BUILD_SCHEMA=$BUILD_SCHEMA
 
 RUN echo -e "${BUILD_SCHEMA//@/\n}" >> ./build_info
@@ -17,4 +18,4 @@ COPY *.lua /usr/local/openresty/nginx/lua/
 COPY *tgz .
 COPY docker-entrypoint.sh .
 RUN chmod +x ./docker-entrypoint.sh
-CMD ./docker-entrypoint.sh
\ No newline at end of file
+CMD ./docker-entrypoint.sh