Merge branch 'dev' of cloud.wodcloud.com:apaas/apaas-v3-ui into dev

.beagle.yml

@@ -31,7 +31,7 @@ pipeline:
     image: registry.cn-qingdao.aliyuncs.com/wod-devops/docker:1.0
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock    
-    base: registry.cn-qingdao.aliyuncs.com/wod/nginx:1.15.9-alpine
+    base: registry.cn-qingdao.aliyuncs.com/wod-devops/ui-base:2.0.0
     repo: apaas/apaas-v3-ui
     version: 1.0.0
     channel: alpha
@@ -42,7 +42,7 @@ pipeline:
     image: registry.cn-qingdao.aliyuncs.com/wod-devops/docker:1.0
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock    
-    base: registry.cn-qingdao.aliyuncs.com/wod/nginx:1.15.9-alpine
+    base: registry.cn-qingdao.aliyuncs.com/wod-devops/ui-base:2.0.0
     repo: apaas/apaas-v3-ui
     version: 1.0.0
     registry: hub.wodcloud.com

build/conf.yaml

-index: /awecloud/ui/
-login: /awecloud/dex/login
-logout: /awecloud/dex/logout
+index: /apaas/ui/
+login: /iam/login/#/login
+logout: /iam/api/logout
\ No newline at end of file

build/dockerfile

 FROM {{ BASEIMAGE }}
 MAINTAINER {{ AUTHOR }}
 LABEL Author={{ AUTHOR }} Name={{ PROJECT }} Version={{ VERSION }}
-ADD ./dist /usr/share/nginx/html
+ADD ./dist /www
\ No newline at end of file
+ADD ./build/conf.yaml /www/conf.yaml
\ No newline at end of file