From 913a826b72cb25a71b0c1fb94670df5f110e28f4 Mon Sep 17 00:00:00 2001
From: zyd <zhangyudi@bd-apaas.com>
Date: Mon, 27 Jul 2020 17:23:41 +0800
Subject: [PATCH] update

---
 .beagle-arm.yml | 19 +++++++++++++++++--
 .beagle.yml     | 40 ++++++++++++++++++++++++++++++++++------
 2 files changed, 51 insertions(+), 8 deletions(-)

diff --git a/.beagle-arm.yml b/.beagle-arm.yml
index ba8c8f9..7fc97d4 100644
--- a/.beagle-arm.yml
+++ b/.beagle-arm.yml
@@ -27,7 +27,7 @@ pipeline:
       - ./yarn.lock
     volumes:
       - /data/cache:/cache
-  docker-dev:
+  docker:
     image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-arm64:1.0
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock    
@@ -43,7 +43,7 @@ pipeline:
         target: REGISTRY_PASSWORD
     when:
       branch: dev
-  docker-master:
+  harbor:
     image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-arm64:1.0
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock    
@@ -58,5 +58,20 @@ pipeline:
         target: REGISTRY_PASSWORD
     when:
       branch: master
+  latest:
+    image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-arm64:1.0
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock    
+    base: registry.cn-qingdao.aliyuncs.com/wod-k8s/node-arm64:14.5.0-buster-slim
+    repo: wod/apaas/apaas-ui-arm64
+    version: "v3.0"
+    registry: registry.cn-qingdao.aliyuncs.com
+    secrets:
+      - source: REGISTRY_USER_ALIYUN
+        target: REGISTRY_USER
+      - source: REGISTRY_PASSWORD_ALIYUN
+        target: REGISTRY_PASSWORD
+    when:
+      branch: master
 
 branches: [master,dev]
diff --git a/.beagle.yml b/.beagle.yml
index c58d19f..8156531 100644
--- a/.beagle.yml
+++ b/.beagle.yml
@@ -30,7 +30,7 @@ pipeline:
       - ./yarn.lock
     volumes:
       - /data/cache:/cache
-  docker-dev:
+  docker:
     image: registry.cn-qingdao.aliyuncs.com/wod-devops/docker:1.0
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock    
@@ -38,17 +38,42 @@ pipeline:
     repo: apaas/apaas-ui
     version: "v3.0.0"
     channel: alpha
-    registry: hub.wodcloud.com
+    registry: registry.cn-qingdao.aliyuncs.com
+    secrets:
+      - source: REGISTRY_USER_ALIYUN
+        target: REGISTRY_USER
+      - source: REGISTRY_PASSWORD_ALIYUN
+        target: REGISTRY_PASSWORD
     when:
       branch: dev
-  docker-master:
+  harbor:
     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-devops/ui-base:2.0.0
     repo: apaas/apaas-ui
     version: "v3.0.0"
-    registry: hub.wodcloud.com
+    registry: registry.cn-qingdao.aliyuncs.com
+    secrets:
+      - source: REGISTRY_USER_ALIYUN
+        target: REGISTRY_USER
+      - source: REGISTRY_PASSWORD_ALIYUN
+        target: REGISTRY_PASSWORD
+    when:
+      branch: master 
+  latest:
+    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-devops/ui-base:2.0.0
+    repo: apaas/apaas-ui
+    version: "v3.0"
+    registry: registry.cn-qingdao.aliyuncs.com
+    secrets:
+      - source: REGISTRY_USER_ALIYUN
+        target: REGISTRY_USER
+      - source: REGISTRY_PASSWORD_ALIYUN
+        target: REGISTRY_PASSWORD
     when:
       branch: master  
   deploy:
@@ -56,6 +81,9 @@ pipeline:
     namespace: apaas-v3
     deployment: apaas-ui
     container: apaas-ui
-    registry: hub.wodcloud.com
-
+    secrets:
+      - source: REGISTRY_USER_ALIYUN
+        target: REGISTRY_USER
+      - source: REGISTRY_PASSWORD_ALIYUN
+        target: REGISTRY_PASSWORD
 branches: [master,dev]
-- 
2.26.0