Merge remote-tracking branch 'origin/dev'

k8s/deploy.sh

@@ -143,7 +143,7 @@ fi
 
 if [ "$service" == "all" ]; then
   #部署前端
-#  build_and_deploy "nginx-dockerfile" "172.20.32.187/ci4s/ci4s-front:${tag}"  "k8s-12front.yaml"
+  build_and_deploy "nginx-dockerfile" "172.20.32.187/ci4s/ci4s-front:${tag}"  "k8s-12front.yaml"
   #部署管理平台
   build_and_deploy "managent-dockerfile" "172.20.32.187/ci4s/ci4s-managent:${tag}"  "k8s-7management.yaml"
   #部署认证中心