Merge branch 'huangpu' of...

Merge branch 'huangpu' of ssh://git.omniview.pro:256/fangdi/housemanage/web/majorproject into huangpu

Dockerfile

 FROM 10.0.6.228:5000/node-nginx:8.12.0-slim
 WORKDIR /app
 COPY . /app/
-RUN  npm config set proxy=http://10.0.6.228:3128 && npm set registry https://registry.npm.taobao.org && npm install && npm run build:xuhui-sit && cp -r dist/* /var/www/html && cp nginx.conf /etc/nginx/conf.d && rm -rf /etc/nginx/sites-enabled &&  rm -rf /app
+RUN  npm config set proxy=http://10.0.6.228:3128 && npm set registry https://registry.npm.taobao.org && npm install && npm run build:huangpu-sit && cp -r dist/* /var/www/html && cp nginx.conf /etc/nginx/conf.d && rm -rf /etc/nginx/sites-enabled &&  rm -rf /app
 

Jenkinsfile

@@ -8,9 +8,9 @@ pipeline {
     environment {
         KUBECONFIG_CREDENTIAL_ID = 'devops-kubeconfig'
         REGISTRY = '10.0.6.228:5000'
-        DOCKERHUB_NAMESPACE = 'house-manage-xh'
+        DOCKERHUB_NAMESPACE = 'house-manage-hp'
         APP_NAME = 'web-main'
-        NAMESPACE = 'house-manage-xh'
+        NAMESPACE = 'house-manage-hp'
     }
 
     stages {