Commit 913a826b authored by 张宇迪's avatar 张宇迪

update

parent 79fb25c9
...@@ -27,7 +27,7 @@ pipeline: ...@@ -27,7 +27,7 @@ pipeline:
- ./yarn.lock - ./yarn.lock
volumes: volumes:
- /data/cache:/cache - /data/cache:/cache
docker-dev: docker:
image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-arm64:1.0 image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-arm64:1.0
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
...@@ -43,7 +43,7 @@ pipeline: ...@@ -43,7 +43,7 @@ pipeline:
target: REGISTRY_PASSWORD target: REGISTRY_PASSWORD
when: when:
branch: dev branch: dev
docker-master: harbor:
image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-arm64:1.0 image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-arm64:1.0
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
...@@ -58,5 +58,20 @@ pipeline: ...@@ -58,5 +58,20 @@ pipeline:
target: REGISTRY_PASSWORD target: REGISTRY_PASSWORD
when: when:
branch: master 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] branches: [master,dev]
...@@ -30,7 +30,7 @@ pipeline: ...@@ -30,7 +30,7 @@ pipeline:
- ./yarn.lock - ./yarn.lock
volumes: volumes:
- /data/cache:/cache - /data/cache:/cache
docker-dev: docker:
image: registry.cn-qingdao.aliyuncs.com/wod-devops/docker:1.0 image: registry.cn-qingdao.aliyuncs.com/wod-devops/docker:1.0
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
...@@ -38,17 +38,42 @@ pipeline: ...@@ -38,17 +38,42 @@ pipeline:
repo: apaas/apaas-ui repo: apaas/apaas-ui
version: "v3.0.0" version: "v3.0.0"
channel: alpha 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: when:
branch: dev branch: dev
docker-master: harbor:
image: registry.cn-qingdao.aliyuncs.com/wod-devops/docker:1.0 image: registry.cn-qingdao.aliyuncs.com/wod-devops/docker:1.0
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
base: registry.cn-qingdao.aliyuncs.com/wod-devops/ui-base:2.0.0 base: registry.cn-qingdao.aliyuncs.com/wod-devops/ui-base:2.0.0
repo: apaas/apaas-ui repo: apaas/apaas-ui
version: "v3.0.0" 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: when:
branch: master branch: master
deploy: deploy:
...@@ -56,6 +81,9 @@ pipeline: ...@@ -56,6 +81,9 @@ pipeline:
namespace: apaas-v3 namespace: apaas-v3
deployment: apaas-ui deployment: apaas-ui
container: 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] branches: [master,dev]
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