Merge branch 'zwg0217' into dev0217

.beagle.yml

@@ -53,7 +53,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
       secret_key:
         from_secret: SECRET_KEY_MINIO
 
-  - name: docker
+  - name: docker-amd64
     image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0
     # 将宿主机的 docker和配置挂载到运行的 docker 容器中，那么在容器中运行 docker 命令时，等同于在宿主机中运行该docker命令
     volumes:
@@ -64,7 +64,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
       dockerfile: .beagle/dockerfile
       repo: wod/apaas-system-ui # 生成镜像的 分组/名称
       version: "5.0.7" # 版本号
-      channel: alpha # 后缀 example: alpha test fix-alpha fix等
+      channel: amd64
       args: "TARGETOS=linux,TARGETARCH=amd64" # 不同架构的构建参数
       registry: registry.cn-qingdao.aliyuncs.com # 私有仓库地址
       registry_user: # 用户
@@ -72,13 +72,13 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
       registry_password: # 密码
         from_secret: REGISTRY_PASSWORD_ALIYUN
 
-  - name: deploy-cloud
+  - name: deploy-amd64
     image: registry.cn-qingdao.aliyuncs.com/wod/devops-kubernetes:1.0
     settings:
       namespace: apaas-v5
       deployment: apaas-manage-ui
       container: apaas-manage-ui
-      image: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.7-alpha
+      image: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.7-amd64
     environment:
       KUBERNETES_SERVER:
         from_secret: KUBERNETES_SERVER
@@ -95,13 +95,60 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
       dockerfile: .beagle/dockerfile
       repo: wod/apaas-system-ui
       version: "5.0.7"
-      channel: alpha-arm64
+      channel: arm64
       args: "TARGETOS=linux,TARGETARCH=arm64"
       registry: registry.cn-qingdao.aliyuncs.com
       registry_user:
         from_secret: REGISTRY_USER_ALIYUN
       registry_password:
         from_secret: REGISTRY_PASSWORD_ALIYUN
+
+  - name: docker-ppc64le
+    image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0
+    volumes:
+      - name: docker-sock
+        path: /var/run/docker.sock
+    settings:
+      base: registry.cn-qingdao.aliyuncs.com/wod/nginx:1.19.5-ppc64le
+      dockerfile: .beagle/dockerfile
+      repo: wod/apaas-system-ui
+      version: "5.0.7"
+      channel: ppc64le
+      args: "TARGETOS=linux,TARGETARCH=ppc64le"
+      registry: registry.cn-qingdao.aliyuncs.com
+      registry_user:
+        from_secret: REGISTRY_USER_ALIYUN
+      registry_password:
+        from_secret: REGISTRY_PASSWORD_ALIYUN
+
+  - name: docker-mips64le
+    image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0
+    volumes:
+      - name: docker-sock
+        path: /var/run/docker.sock
+    settings:
+      base: registry.cn-qingdao.aliyuncs.com/wod/nginx:1.19.5-mips64le
+      dockerfile: .beagle/dockerfile
+      repo: wod/apaas-system-ui
+      version: "5.0.7"
+      channel: mips64le
+      args: "TARGETOS=linux,TARGETARCH=mips64le"
+      registry: registry.cn-qingdao.aliyuncs.com
+      registry_user:
+        from_secret: REGISTRY_USER_ALIYUN
+      registry_password:
+        from_secret: REGISTRY_PASSWORD_ALIYUN
+
+  - name: docker-arch
+    image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-manifest:1.0
+    settings:
+      platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/mips64le
+      template: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.7-ARCH
+      target: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.7
+      username:
+        from_secret: REGISTRY_USER_ALIYUN
+      password:
+        from_secret: REGISTRY_PASSWORD_ALIYUN
 ---
 clone:
   disable: true
@@ -132,8 +179,8 @@ steps:
       REGISTRY_PASSWORD:
         from_secret: REGISTRY_PASSWORD_ALIYUN
     settings:
-      source: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.10-alpha
-      target: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.10
+      source: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.10-amd64
+      target: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0-amd64
       registry: registry.cn-qingdao.aliyuncs.com
 
   - name: harbor-arm64
@@ -150,9 +197,44 @@ steps:
       REGISTRY_PASSWORD:
         from_secret: REGISTRY_PASSWORD_ALIYUN
     settings:
-      source: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.10-alpha-arm64
-      target: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.10-arm64
+      source: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.10-arm64
+      target: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0-arm64
+      registry: registry.cn-qingdao.aliyuncs.com
+
+  - name: harbor-ppc64le
+    image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0
+    volumes:
+      - name: docker-sock
+        path: /var/run/docker.sock
+    pull: always
+    environment: 
+      http_proxy: http://10.11.92.33:1282
+      https_proxy: http://10.11.92.33:1282
+      REGISTRY_USER:
+        from_secret: REGISTRY_USER_ALIYUN
+      REGISTRY_PASSWORD:
+        from_secret: REGISTRY_PASSWORD_ALIYUN
+    settings:
+      source: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.10-ppc64le
+      target: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0-ppc64le
       registry: registry.cn-qingdao.aliyuncs.com
+
+  - name: harbor-mips64le
+    image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0
+    volumes:
+      - name: docker-sock
+        path: /var/run/docker.sock
+    pull: always
+    environment:
+      http_proxy: http://10.11.92.33:1282
+      https_proxy: http://10.11.92.33:1282
+      REGISTRY_USER:
+        from_secret: REGISTRY_USER_ALIYUN
+      REGISTRY_PASSWORD:
+        from_secret: REGISTRY_PASSWORD_ALIYUN
+    settings:
+      source: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.10-mips64le
+      target: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0-mips64le
 ##--------------对于需要保密的信息隐藏，减少账户信息的泄密⬇-----------------##
 ---
 kind: secret