From 8792fc5bf2ba81154a5c3a661ae0dac38611bf59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=A5=E5=9B=BD=E5=8D=8E?= Date: Wed, 6 Aug 2025 17:40:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E6=B0=B4=E7=BA=BF=E6=9B=B4=E6=96=B0-?= =?UTF-8?q?=E6=9B=B4=E6=8D=A2jdk17?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .beagle.yml | 144 ++++++++++++++++++++++++++-------------------------- 1 file changed, 72 insertions(+), 72 deletions(-) diff --git a/.beagle.yml b/.beagle.yml index 811511a..2e753ff 100644 --- a/.beagle.yml +++ b/.beagle.yml @@ -45,74 +45,74 @@ steps: from_secret: ACCESS_KEY_MINIO secret_key: from_secret: SECRET_KEY_MINIO - - name: docker-system-amd64 - 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/openjdk:11.0-jdk-amd64 # 基础镜像 - dockerfile: .beagle/dockerfile.system - repo: zjk/system - version: "1.0" - channel: amd64 - args: "TARGETOS=linux,TARGETARCH=amd64" - registry: hub.wodcloud.com - registry_user: - from_secret: REGISTRY_USER - registry_password: - from_secret: REGISTRY_PASSWORD - - name: docker-auth-amd64 - 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/openjdk:11.0-jdk-amd64 # 基础镜像 - dockerfile: .beagle/dockerfile.auth - repo: zjk/auth - version: "1.0" - channel: amd64 - args: "TARGETOS=linux,TARGETARCH=amd64" - registry: hub.wodcloud.com - registry_user: - from_secret: REGISTRY_USER - registry_password: - from_secret: REGISTRY_PASSWORD - - name: docker-resource-amd64 - 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/openjdk:11.0-jdk-amd64 # 基础镜像 - dockerfile: .beagle/dockerfile.resource - repo: zjk/resource - version: "1.0" - channel: amd64 - args: "TARGETOS=linux,TARGETARCH=amd64" - registry: hub.wodcloud.com - registry_user: - from_secret: REGISTRY_USER - registry_password: - from_secret: REGISTRY_PASSWORD - - name: docker-zjkapi-amd64 - 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/openjdk:11.0-jdk-amd64 # 基础镜像 - dockerfile: .beagle/dockerfile.zjkapi - repo: zjk/zjk-api - version: "1.0" - channel: amd64 - args: "TARGETOS=linux,TARGETARCH=amd64" - registry: hub.wodcloud.com - registry_user: - from_secret: REGISTRY_USER - registry_password: - from_secret: REGISTRY_PASSWORD + # - name: docker-system-amd64 + # 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/openjdk:11.0-jdk-amd64 # 基础镜像 + # dockerfile: .beagle/dockerfile.system + # repo: zjk/system + # version: "1.0" + # channel: amd64 + # args: "TARGETOS=linux,TARGETARCH=amd64" + # registry: hub.wodcloud.com + # registry_user: + # from_secret: REGISTRY_USER + # registry_password: + # from_secret: REGISTRY_PASSWORD + # - name: docker-auth-amd64 + # 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/openjdk:11.0-jdk-amd64 # 基础镜像 + # dockerfile: .beagle/dockerfile.auth + # repo: zjk/auth + # version: "1.0" + # channel: amd64 + # args: "TARGETOS=linux,TARGETARCH=amd64" + # registry: hub.wodcloud.com + # registry_user: + # from_secret: REGISTRY_USER + # registry_password: + # from_secret: REGISTRY_PASSWORD + # - name: docker-resource-amd64 + # 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/openjdk:11.0-jdk-amd64 # 基础镜像 + # dockerfile: .beagle/dockerfile.resource + # repo: zjk/resource + # version: "1.0" + # channel: amd64 + # args: "TARGETOS=linux,TARGETARCH=amd64" + # registry: hub.wodcloud.com + # registry_user: + # from_secret: REGISTRY_USER + # registry_password: + # from_secret: REGISTRY_PASSWORD + # - name: docker-zjkapi-amd64 + # 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/openjdk:11.0-jdk-amd64 # 基础镜像 + # dockerfile: .beagle/dockerfile.zjkapi + # repo: zjk/zjk-api + # version: "1.0" + # channel: amd64 + # args: "TARGETOS=linux,TARGETARCH=amd64" + # registry: hub.wodcloud.com + # registry_user: + # from_secret: REGISTRY_USER + # registry_password: + # from_secret: REGISTRY_PASSWORD - name: docker-zjkapi-arm64 image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0 @@ -120,7 +120,7 @@ steps: - name: docker-sock path: /var/run/docker.sock settings: - base: registry.cn-qingdao.aliyuncs.com/wod/openjdk:11.0-jdk-arm64 + base: hub.wodcloud.com/base/openjdk17:17-jdk-slim dockerfile: .beagle/dockerfile.resource repo: zjk/zjk-api version: "1.0" @@ -137,7 +137,7 @@ steps: - name: docker-sock path: /var/run/docker.sock settings: - base: registry.cn-qingdao.aliyuncs.com/wod/openjdk:11.0-jdk-arm64 + base: hub.wodcloud.com/base/openjdk17:17-jdk-slim dockerfile: .beagle/dockerfile.auth repo: zjk/auth version: "1.0" @@ -154,7 +154,7 @@ steps: - name: docker-sock path: /var/run/docker.sock settings: - base: registry.cn-qingdao.aliyuncs.com/wod/openjdk:11.0-jdk-arm64 + base: hub.wodcloud.com/base/openjdk17:17-jdk-slim dockerfile: .beagle/dockerfile.system repo: zjk/system version: "1.0" @@ -171,7 +171,7 @@ steps: - name: docker-sock path: /var/run/docker.sock settings: - base: registry.cn-qingdao.aliyuncs.com/wod/openjdk:11.0-jdk-arm64 + base: hub.wodcloud.com/base/openjdk17:17-jdk-slim dockerfile: .beagle/dockerfile.resource repo: zjk/resource version: "1.0" -- 2.26.0