From d054f8e1f936e45035b0d5e210c0af0d219e2a6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Wed, 18 Sep 2024 15:10:50 +0800
Subject: [PATCH] 'commit'

---
 ds-base/Dockerfile                                |  2 +-
 ds-build/src/main/java/Util/PublishUtil.java      | 15 +++++++--------
 .../6、手工制作JDK21的Docker镜像.md       | 13 +++++++++++++
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/ds-base/Dockerfile b/ds-base/Dockerfile
index beafc578..edf8f918 100644
--- a/ds-base/Dockerfile
+++ b/ds-base/Dockerfile
@@ -1,4 +1,4 @@
-FROM  openjdk:8u332-jre-slim-bullseye AS runner
+FROM  registry.cn-hangzhou.aliyuncs.com/dsideal/jdk:21
 
 # WORKDIR指令用于设置容器内部的工作目录，即后续指令执行时的当前目录。当Docker容器启动并执行命令时，这些命令将在WORKDIR指定的目录中执行。
 WORKDIR /root
diff --git a/ds-build/src/main/java/Util/PublishUtil.java b/ds-build/src/main/java/Util/PublishUtil.java
index 18f292cb..81f9c833 100644
--- a/ds-build/src/main/java/Util/PublishUtil.java
+++ b/ds-build/src/main/java/Util/PublishUtil.java
@@ -1,7 +1,6 @@
 package Util;
 
 import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.io.file.PathUtil;
 import cn.hutool.core.util.ZipUtil;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
@@ -143,19 +142,19 @@ public class PublishUtil {
         System.out.println("镜像打包完成，镜像ID=" + imageId);
 
         //登录镜像仓库
-        cmd = "docker login --username=驿来特充电 --password=ylt5033. registry.cn-hangzhou.aliyuncs.com";
+        cmd = "docker login --username=东师黄海 --password=DsideaL4r5t6y7u registry.cn-hangzhou.aliyuncs.com";
         ssh.exec(cmd);
         System.out.println("仓库登录成功！");
 
         System.out.println("打标签...");
-        cmd = "docker tag " + imageId + " registry.cn-hangzhou.aliyuncs.com/yltcharge/" + projectName + ":" + newVersion;
+        cmd = "docker tag " + imageId + " registry.cn-hangzhou.aliyuncs.com/dsideal/" + projectName + ":" + newVersion;
         ssh.exec(cmd);
 
-//        System.out.println("开始推送到远程仓库，稍等...");
-//        cmd = "docker push registry.cn-hangzhou.aliyuncs.com/yltcharge/" + projectName + ":" + newVersion;
-//        ssh.exec(cmd);
-//
-//        System.out.println("推送到远程仓库完成！");
+        System.out.println("开始推送到远程仓库，稍等...");
+        cmd = "docker push registry.cn-hangzhou.aliyuncs.com/dsideal/" + projectName + ":" + newVersion;
+        ssh.exec(cmd);
+
+        System.out.println("推送到远程仓库完成！");
 
         ssh.disconnect();
         System.out.println("恭喜，镜像打包成功！");
diff --git a/操作文档/6、手工制作JDK21的Docker镜像.md b/操作文档/6、手工制作JDK21的Docker镜像.md
index f58cf22c..260d3996 100644
--- a/操作文档/6、手工制作JDK21的Docker镜像.md
+++ b/操作文档/6、手工制作JDK21的Docker镜像.md
@@ -119,5 +119,18 @@ docker tag dsideal/jdk:21 registry.cn-hangzhou.aliyuncs.com/dsideal/jdk:21
 
 # 上传镜像
 docker push registry.cn-hangzhou.aliyuncs.com/dsideal/jdk:21
+
+# 测试拉取
+docker pull registry.cn-hangzhou.aliyuncs.com/dsideal/jdk:21
+```
+
+![](https://dsideal.obs.cn-north-1.myhuaweicloud.com/HuangHai/BlogImages/202409181457611.png)
+
+![](https://dsideal.obs.cn-north-1.myhuaweicloud.com/HuangHai/BlogImages/202409181456836.png)
+
+
+
+```shell
+
 ```