流水线更新-更换jdk17

.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"