Commit 5c800b31 authored by 李丹's avatar 李丹

Merge branch 'dev' of ssh://cloud.wodcloud.com:10022/apaas/apaas-login into dev

parents 25ed211a 2c7a0489
...@@ -47,7 +47,7 @@ pipeline: ...@@ -47,7 +47,7 @@ pipeline:
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/bg-login-base:v3.0 base: registry.cn-qingdao.aliyuncs.com/wod/apaas-login-base:v3.0
dockerfile: .beagle/dockerfile dockerfile: .beagle/dockerfile
repo: wod/apaas-login repo: wod/apaas-login
version: v3.0.2 version: v3.0.2
...@@ -114,7 +114,7 @@ pipeline: ...@@ -114,7 +114,7 @@ pipeline:
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/bg-login-base:v3.0-arm64 base: registry.cn-qingdao.aliyuncs.com/wod/apaas-login-base:v3.0-arm64
dockerfile: .beagle/dockerfile dockerfile: .beagle/dockerfile
repo: wod/apaas-login repo: wod/apaas-login
version: v3.0.2 version: v3.0.2
...@@ -170,7 +170,7 @@ pipeline: ...@@ -170,7 +170,7 @@ pipeline:
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/bg-login-base:v3.0-ppc64le base: registry.cn-qingdao.aliyuncs.com/wod/apaas-login-base:v3.0-ppc64le
dockerfile: .beagle/dockerfile dockerfile: .beagle/dockerfile
repo: wod/apaas-login repo: wod/apaas-login
version: v3.0.2 version: v3.0.2
...@@ -224,7 +224,7 @@ pipeline: ...@@ -224,7 +224,7 @@ pipeline:
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/bg-login-base:v3.0-mips64le base: registry.cn-qingdao.aliyuncs.com/wod/apaas-login-base:v3.0-mips64le
dockerfile: .beagle/dockerfile dockerfile: .beagle/dockerfile
repo: wod/apaas-login repo: wod/apaas-login
version: v3.0.2 version: v3.0.2
......
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