Commit 5af9e970 authored by whidy#mbp's avatar whidy#mbp

合并dev的部分代码

parent 4f2abe4a
# platform:
# runner: 10.11.92.37
kind: pipeline
name: dev
name: dev0508
trigger:
branch:
- dev
- dev0508
clone:
disable: true
......@@ -65,7 +65,7 @@ steps: # 定义流水线执行步骤,这些步骤将顺序执行
base: registry.cn-qingdao.aliyuncs.com/wod/nginx:1.19.5 # 基础镜像,根据项目需求进行使用,如果第三方登录改成ui-base
dockerfile: .beagle/dockerfile
repo: wod/apaas-system-ui # 生成镜像的 分组/名称
version: "5.0.14" # 版本号
version: "5.0.15" # 版本号
channel: amd64
args: "TARGETOS=linux,TARGETARCH=amd64" # 不同架构的构建参数
registry: registry.cn-qingdao.aliyuncs.com # 私有仓库地址
......@@ -77,10 +77,10 @@ steps: # 定义流水线执行步骤,这些步骤将顺序执行
- name: deploy-amd64
image: registry.cn-qingdao.aliyuncs.com/wod/devops-kubernetes:1.0
settings:
namespace: apaas-v5-demo
namespace: apaas-v5
deployment: apaas-manage-ui
container: apaas-manage-ui
image: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.14-amd64
image: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.15-amd64
environment:
KUBERNETES_SERVER:
from_secret: KUBERNETES_SERVER
......@@ -96,7 +96,7 @@ steps: # 定义流水线执行步骤,这些步骤将顺序执行
base: registry.cn-qingdao.aliyuncs.com/wod/nginx:1.19.5-arm64
dockerfile: .beagle/dockerfile
repo: wod/apaas-system-ui
version: "5.0.14"
version: "5.0.15"
channel: arm64
args: "TARGETOS=linux,TARGETARCH=arm64"
registry: registry.cn-qingdao.aliyuncs.com
......@@ -114,7 +114,7 @@ steps: # 定义流水线执行步骤,这些步骤将顺序执行
base: registry.cn-qingdao.aliyuncs.com/wod/nginx:1.19.5-ppc64le
dockerfile: .beagle/dockerfile
repo: wod/apaas-system-ui
version: "5.0.14"
version: "5.0.15"
channel: ppc64le
args: "TARGETOS=linux,TARGETARCH=ppc64le"
registry: registry.cn-qingdao.aliyuncs.com
......@@ -132,7 +132,7 @@ steps: # 定义流水线执行步骤,这些步骤将顺序执行
base: registry.cn-qingdao.aliyuncs.com/wod/nginx:1.19.5-mips64le
dockerfile: .beagle/dockerfile
repo: wod/apaas-system-ui
version: "5.0.14"
version: "5.0.15"
channel: mips64le
args: "TARGETOS=linux,TARGETARCH=mips64le"
registry: registry.cn-qingdao.aliyuncs.com
......@@ -145,8 +145,8 @@ steps: # 定义流水线执行步骤,这些步骤将顺序执行
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.14-ARCH
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.14
template: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.15-ARCH
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.15
username:
from_secret: REGISTRY_USER_ALIYUN
password:
......@@ -181,7 +181,7 @@ steps:
REGISTRY_PASSWORD:
from_secret: REGISTRY_PASSWORD_ALIYUN
settings:
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.14-amd64
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.15-amd64
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0-amd64
registry: registry.cn-qingdao.aliyuncs.com
......@@ -199,7 +199,7 @@ steps:
REGISTRY_PASSWORD:
from_secret: REGISTRY_PASSWORD_ALIYUN
settings:
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.14-arm64
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.15-arm64
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0-arm64
registry: registry.cn-qingdao.aliyuncs.com
......@@ -217,7 +217,7 @@ steps:
REGISTRY_PASSWORD:
from_secret: REGISTRY_PASSWORD_ALIYUN
settings:
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.14-ppc64le
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.15-ppc64le
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0-ppc64le
registry: registry.cn-qingdao.aliyuncs.com
......@@ -235,7 +235,7 @@ steps:
REGISTRY_PASSWORD:
from_secret: REGISTRY_PASSWORD_ALIYUN
settings:
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.14-mips64le
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.15-mips64le
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0-mips64le
##--------------对于需要保密的信息隐藏,减少账户信息的泄密⬇-----------------##
---
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment