From 68cc61e146287d10a75612ec787556d1304b768c Mon Sep 17 00:00:00 2001 From: gaoshiyao Date: Thu, 4 Jun 2020 11:33:26 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B7=9F=E6=8D=A2=E5=9F=BA=E7=A1=80=E9=95=9C?= =?UTF-8?q?=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .beagle.yml | 4 ++-- build/conf.yaml | 6 +++--- build/dockerfile | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.beagle.yml b/.beagle.yml index 6a523e5..7c0db7a 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 45dfbfc..3d2d24d 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 ab1ccc7..7a41e8c 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 -- 2.26.0