diff --git a/.beagle.yml b/.beagle.yml index 6a523e52b6efb781dfec6e5057b879834d73ae73..7c0db7a325cbb4c81df6fcb7033b5f669414bf42 100644 --- a/.beagle.yml +++ b/.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 diff --git a/build/conf.yaml b/build/conf.yaml index 45dfbfccb0ff0d40963b8b67223b80fc4adbeed8..3d2d24d1a7a519f38a69f604bbf52e56c850942a 100644 --- a/build/conf.yaml +++ b/build/conf.yaml @@ -1,3 +1,3 @@ -index: /awecloud/ui/ -login: /awecloud/dex/login -logout: /awecloud/dex/logout \ No newline at end of file +index: /apaas/ui/ +login: /iam/api/login +logout: /iam/api/logout \ No newline at end of file diff --git a/build/dockerfile b/build/dockerfile index ab1ccc78db59b81bfe17a445d553872f7511bf35..7a41e8ce962d4b76a989e4fe6faa0e3d7d8b0b3d 100644 --- a/build/dockerfile +++ b/build/dockerfile @@ -1,4 +1,5 @@ FROM {{ BASEIMAGE }} MAINTAINER {{ AUTHOR }} LABEL Author={{ AUTHOR }} Name={{ PROJECT }} Version={{ VERSION }} -ADD ./dist /usr/share/nginx/html \ No newline at end of file +ADD ./dist /www +ADD ./build/conf.yaml /www/conf.yaml \ No newline at end of file