diff --git a/.beagle.yml b/.beagle.yml index de4f0cc59f24c5e5c74e38242e7b8b077b9f0b3d..923c1e37b9c9f09598a88108b59e1a64cdaede51 100644 --- a/.beagle.yml +++ b/.beagle.yml @@ -5,7 +5,6 @@ platform: runner: 10.11.92.36 - volumes: - name: docker host: @@ -19,9 +18,10 @@ steps: path: /var/run/docker.sock settings: dockerfile: ./Dockerfile + base: registry.cn-qingdao.aliyuncs.com/wod-k8s/alpine:3.10-amd64 registry: registry.cn-qingdao.aliyuncs.com repo: wod/rcache - tag: 7.0.7 + tag: 7.0.7-amd64 registry_user: from_secret: REGISTRY_USER_ALIYUN registry_password: @@ -35,42 +35,25 @@ steps: - name: docker path: /var/run/docker.sock settings: - dockerfile: .beagle/dockerfile - base: registry.cn-qingdao.aliyuncs.com/wod/openjdk:11-jre-slim-arm64 - registry: registry.cn-qingdao.aliyuncs.com - repo: wod/openjdk - tag: 11-jdk-slim-migration-arm64 - 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 - path: /var/run/docker.sock - settings: - dockerfile: .beagle/dockerfile + dockerfile: ./Dockerfile + base: registry.cn-qingdao.aliyuncs.com/wod-k8s/alpine:3.10-arm64 registry: registry.cn-qingdao.aliyuncs.com - repo: wod/openjdk - tag: 11-jdk-slim-migration-ppc64le + repo: wod/rcache + tag: 7.0.7-arm64 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:v1.2.3 volumes: - name: docker path: /var/run/docker.sock settings: - platforms: linux/amd64,linux/arm64,linux/ppc64le - template: registry.cn-qingdao.aliyuncs.com/wod/openjdk:11-jdk-slim-migration-ARCH - target: registry.cn-qingdao.aliyuncs.com/wod/openjdk:11-jre-slim + platforms: linux/amd64,linux/arm64 + template: registry.cn-qingdao.aliyuncs.com/wod/rcache:7.0.7-ARCH + target: registry.cn-qingdao.aliyuncs.com/wod/rcache:7.0.7 username: from_secret: REGISTRY_USER_ALIYUN password: