Merge branch 'dev'

e6af816f · 张宇迪 · 6329990f · f2160a49 · e6af816f
Commit e6af816f authored Jul 20, 2020 by 张宇迪
Hide whitespace changes
Inline Side-by-side

Showing with 23 additions and 23 deletions

.beagle.yml .beagle.yml +23 -23

No files found.
--- a/.beagle.yml
+++ b/.beagle.yml
@@ -21,14 +21,14 @@ pipeline:
    volumes:
      - /var/run/docker.sock:/var/run/docker.sock
    base: registry.cn-qingdao.aliyuncs.com/wod/alpine-glibc:3.8
-    repo: apaas/apaas-meshproxy
+    repo: wod/apaas-meshproxy
    version: v3.0.0
    channel: alpha
-    registry: hub.wodcloud.com
+    registry: registry.cn-qingdao.aliyuncs.com
    secrets:
-      - source: REGISTRY_USER
+      - source: REGISTRY_USER_ALIYUN
        target: REGISTRY_USER
-      - source: REGISTRY_PASSWORD
+      - source: REGISTRY_PASSWORD_ALIYUN
        target: REGISTRY_PASSWORD
    when:
      branch: [dev]
@@ -38,29 +38,29 @@ pipeline:
    volumes:
      - /var/run/docker.sock:/var/run/docker.sock
    base: registry.cn-qingdao.aliyuncs.com/wod/alpine-glibc:3.8
-    repo: apaas/apaas-meshproxy
+    repo: wod/apaas-meshproxy
    version: "v3.0.0"
-    registry: hub.wodcloud.com
+    registry: registry.cn-qingdao.aliyuncs.com
    secrets:
-      - source: REGISTRY_USER
+      - source: REGISTRY_USER_ALIYUN
        target: REGISTRY_USER
-      - source: REGISTRY_PASSWORD
-        target: REGISTRY_PASSWORD
-    when:
-      branch: [master]
-  docker-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/alpine-glibc:3.8
-    repo: apaas/apaas-meshproxy
-    version: v3
-    registry: hub.wodcloud.com
-    secrets:
-      - source: REGISTRY_USER
-        target: REGISTRY_USER
-      - source: REGISTRY_PASSWORD
+      - source: REGISTRY_PASSWORD_ALIYUN
        target: REGISTRY_PASSWORD
    when:
      branch: [master]
+#  docker-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/alpine-glibc:3.8
+#    repo: wod/apaas-meshproxy
+#    version: v3
+#    registry: hub.wodcloud.com
+#    secrets:
+#      - source: REGISTRY_USER
+#        target: REGISTRY_USER
+#      - source: REGISTRY_PASSWORD
+#        target: REGISTRY_PASSWORD
+#    when:
+#      branch: [master]