跟换基础镜像

68cc61e1 · gaoshiyao · d597caf1 · 68cc61e1 · 68cc61e1 · 68cc61e1
Commit 68cc61e1 authored Jun 04, 2020 by gaoshiyao
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 6 deletions

.beagle.yml .beagle.yml +2 -2

build/conf.yaml build/conf.yaml +3 -3

build/dockerfile build/dockerfile +2 -1

No files found.
--- 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

--- a/build/conf.yaml
+++ b/build/conf.yaml
-index: /awecloud/ui/
+index: /apaas/ui/
-login: /awecloud/dex/login
+login: /iam/api/login
-logout: /awecloud/dex/logout
+logout: /iam/api/logout
\ No newline at end of file
--- a/build/dockerfile
+++ b/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