From dce850b710486080a6393ef890cf3aad20c3cd68 Mon Sep 17 00:00:00 2001 From: Odboy Date: Sat, 6 Dec 2025 21:08:36 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20JDK=20=E9=A2=84=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E6=8A=BD=E5=88=B0=20prepare-jdk.sh=EF=BC=8C?= =?UTF-8?q?=E5=B9=B6=E5=8A=A0=E4=BA=A7=E7=89=A9=E7=BC=93=E5=AD=98=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - runtime-jdk11/17/21:下载 OpenJDK 二进制包、解包、删除 lib/src.zip、 重新打包、清理中间文件的步骤从 build.sh 抽到独立的 prepare-jdk.sh - prepare-jdk.sh 在 jdk-<版本>.tar.gz 已存在时直接跳过,重复执行不会重新下载; 原始包保留在中间态,下载中断后可复用 - build.sh 只负责调用 prepare-jdk.sh 后 docker build/push,统一加 shebang 与 set -euo pipefail - 三个目录新增 .dockerignore 与 .gitignore --- image/runtime-jdk11/.dockerignore | 6 ++++++ image/runtime-jdk11/.gitignore | 3 +++ image/runtime-jdk11/build.sh | 13 +++++++------ image/runtime-jdk11/prepare-jdk.sh | 27 +++++++++++++++++++++++++++ image/runtime-jdk17/.dockerignore | 6 ++++++ image/runtime-jdk17/.gitignore | 3 +++ image/runtime-jdk17/build.sh | 13 +++++++------ image/runtime-jdk17/prepare-jdk.sh | 27 +++++++++++++++++++++++++++ image/runtime-jdk21/.dockerignore | 6 ++++++ image/runtime-jdk21/.gitignore | 3 +++ image/runtime-jdk21/build.sh | 13 +++++++------ image/runtime-jdk21/prepare-jdk.sh | 27 +++++++++++++++++++++++++++ 12 files changed, 129 insertions(+), 18 deletions(-) create mode 100644 image/runtime-jdk11/.dockerignore create mode 100644 image/runtime-jdk11/.gitignore mode change 100644 => 100755 image/runtime-jdk11/build.sh create mode 100755 image/runtime-jdk11/prepare-jdk.sh create mode 100644 image/runtime-jdk17/.dockerignore create mode 100644 image/runtime-jdk17/.gitignore mode change 100644 => 100755 image/runtime-jdk17/build.sh create mode 100755 image/runtime-jdk17/prepare-jdk.sh create mode 100644 image/runtime-jdk21/.dockerignore create mode 100644 image/runtime-jdk21/.gitignore mode change 100644 => 100755 image/runtime-jdk21/build.sh create mode 100755 image/runtime-jdk21/prepare-jdk.sh diff --git a/image/runtime-jdk11/.dockerignore b/image/runtime-jdk11/.dockerignore new file mode 100644 index 0000000..312b459 --- /dev/null +++ b/image/runtime-jdk11/.dockerignore @@ -0,0 +1,6 @@ +# 由 prepare-jdk.sh 生成的 jdk-*.tar.gz 经 ADD 解压进镜像, +# ADD 的源文件必须在构建上下文内,因此 *.tar.gz 不能在这里忽略 +build.sh +prepare-jdk.sh +.git/ +.DS_Store diff --git a/image/runtime-jdk11/.gitignore b/image/runtime-jdk11/.gitignore new file mode 100644 index 0000000..9a1bb28 --- /dev/null +++ b/image/runtime-jdk11/.gitignore @@ -0,0 +1,3 @@ +# 构建产物 / 本地缓存 +*.tar.gz +.DS_Store diff --git a/image/runtime-jdk11/build.sh b/image/runtime-jdk11/build.sh old mode 100644 new mode 100755 index 2ee6d93..12391d1 --- a/image/runtime-jdk11/build.sh +++ b/image/runtime-jdk11/build.sh @@ -1,9 +1,10 @@ -curl -O https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_linux-x64_bin.tar.gz -tar -xzvf openjdk-11.0.2_linux-x64_bin.tar.gz -rm -f openjdk-11.0.2_linux-x64_bin.tar.gz -rm -f jdk-11.0.2/lib/src.zip -tar -czvf jdk-11.0.2.tar.gz jdk-11.0.2 -rm -rf jdk-11.0.2 +#!/usr/bin/env bash +# 先运行 prepare-jdk.sh 生成 jdk-11.0.2.tar.gz,再基于本地文件构建镜像 +set -euo pipefail +cd "$(dirname "$0")" + +./prepare-jdk.sh + IMAGE=registry.cn-shanghai.aliyuncs.com/odboy/kenaito:runtime-jdk11 docker build -t "${IMAGE}" . docker push "${IMAGE}" diff --git a/image/runtime-jdk11/prepare-jdk.sh b/image/runtime-jdk11/prepare-jdk.sh new file mode 100755 index 0000000..dcb2dbf --- /dev/null +++ b/image/runtime-jdk11/prepare-jdk.sh @@ -0,0 +1,27 @@ +#!/usr/bin/env bash +# 生成 jdk-11.0.2.tar.gz 供 Dockerfile 中 ADD 使用: +# 下载 OpenJDK 二进制包 → 解包 → 删除体积大的 lib/src.zip → 重新打包 → 清理中间文件 +# 产物已存在时直接复用,重复执行不会重新下载 +set -euo pipefail +cd "$(dirname "$0")" + +VERSION=11.0.2 +PKG=jdk-${VERSION}.tar.gz +SRC_PKG=openjdk-${VERSION}_linux-x64_bin.tar.gz +URL=https://download.java.net/java/GA/jdk11/9/GPL/${SRC_PKG} + +if [ -f "${PKG}" ]; then + echo "${PKG} 已存在,跳过" + exit 0 +fi + +if [ ! -f "${SRC_PKG}" ]; then + curl -fL -o "${SRC_PKG}" "${URL}" +fi + +tar -xzf "${SRC_PKG}" +rm -f "jdk-${VERSION}/lib/src.zip" +tar -czf "${PKG}" "jdk-${VERSION}" +rm -rf "jdk-${VERSION}" "${SRC_PKG}" + +./build.sh diff --git a/image/runtime-jdk17/.dockerignore b/image/runtime-jdk17/.dockerignore new file mode 100644 index 0000000..312b459 --- /dev/null +++ b/image/runtime-jdk17/.dockerignore @@ -0,0 +1,6 @@ +# 由 prepare-jdk.sh 生成的 jdk-*.tar.gz 经 ADD 解压进镜像, +# ADD 的源文件必须在构建上下文内,因此 *.tar.gz 不能在这里忽略 +build.sh +prepare-jdk.sh +.git/ +.DS_Store diff --git a/image/runtime-jdk17/.gitignore b/image/runtime-jdk17/.gitignore new file mode 100644 index 0000000..9a1bb28 --- /dev/null +++ b/image/runtime-jdk17/.gitignore @@ -0,0 +1,3 @@ +# 构建产物 / 本地缓存 +*.tar.gz +.DS_Store diff --git a/image/runtime-jdk17/build.sh b/image/runtime-jdk17/build.sh old mode 100644 new mode 100755 index 852ae76..4ac906c --- a/image/runtime-jdk17/build.sh +++ b/image/runtime-jdk17/build.sh @@ -1,9 +1,10 @@ -curl -O https://download.java.net/java/GA/jdk17.0.2/dfd4a8d0985749f896bed50d7138ee7f/8/GPL/openjdk-17.0.2_linux-x64_bin.tar.gz -tar -xzvf openjdk-17.0.2_linux-x64_bin.tar.gz -rm -f openjdk-17.0.2_linux-x64_bin.tar.gz -rm -f jdk-17.0.2/lib/src.zip -tar -czvf jdk-17.0.2.tar.gz jdk-17.0.2 -rm -rf jdk-17.0.2 +#!/usr/bin/env bash +# 先运行 prepare-jdk.sh 生成 jdk-17.0.2.tar.gz,再基于本地文件构建镜像 +set -euo pipefail +cd "$(dirname "$0")" + +./prepare-jdk.sh + IMAGE=registry.cn-shanghai.aliyuncs.com/odboy/kenaito:runtime-jdk17 docker build -t "${IMAGE}" . docker push "${IMAGE}" diff --git a/image/runtime-jdk17/prepare-jdk.sh b/image/runtime-jdk17/prepare-jdk.sh new file mode 100755 index 0000000..2d45fbb --- /dev/null +++ b/image/runtime-jdk17/prepare-jdk.sh @@ -0,0 +1,27 @@ +#!/usr/bin/env bash +# 生成 jdk-17.0.2.tar.gz 供 Dockerfile 中 ADD 使用: +# 下载 OpenJDK 二进制包 → 解包 → 删除体积大的 lib/src.zip → 重新打包 → 清理中间文件 +# 产物已存在时直接复用,重复执行不会重新下载 +set -euo pipefail +cd "$(dirname "$0")" + +VERSION=17.0.2 +PKG=jdk-${VERSION}.tar.gz +SRC_PKG=openjdk-${VERSION}_linux-x64_bin.tar.gz +URL=https://download.java.net/java/GA/jdk17.0.2/dfd4a8d0985749f896bed50d7138ee7f/8/GPL/${SRC_PKG} + +if [ -f "${PKG}" ]; then + echo "${PKG} 已存在,跳过" + exit 0 +fi + +if [ ! -f "${SRC_PKG}" ]; then + curl -fL -o "${SRC_PKG}" "${URL}" +fi + +tar -xzf "${SRC_PKG}" +rm -f "jdk-${VERSION}/lib/src.zip" +tar -czf "${PKG}" "jdk-${VERSION}" +rm -rf "jdk-${VERSION}" "${SRC_PKG}" + +./build.sh diff --git a/image/runtime-jdk21/.dockerignore b/image/runtime-jdk21/.dockerignore new file mode 100644 index 0000000..312b459 --- /dev/null +++ b/image/runtime-jdk21/.dockerignore @@ -0,0 +1,6 @@ +# 由 prepare-jdk.sh 生成的 jdk-*.tar.gz 经 ADD 解压进镜像, +# ADD 的源文件必须在构建上下文内,因此 *.tar.gz 不能在这里忽略 +build.sh +prepare-jdk.sh +.git/ +.DS_Store diff --git a/image/runtime-jdk21/.gitignore b/image/runtime-jdk21/.gitignore new file mode 100644 index 0000000..9a1bb28 --- /dev/null +++ b/image/runtime-jdk21/.gitignore @@ -0,0 +1,3 @@ +# 构建产物 / 本地缓存 +*.tar.gz +.DS_Store diff --git a/image/runtime-jdk21/build.sh b/image/runtime-jdk21/build.sh old mode 100644 new mode 100755 index 5247d7a..b2ab585 --- a/image/runtime-jdk21/build.sh +++ b/image/runtime-jdk21/build.sh @@ -1,9 +1,10 @@ -curl -O https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_linux-x64_bin.tar.gz -tar -xzvf openjdk-21.0.2_linux-x64_bin.tar.gz -rm -f openjdk-21.0.2_linux-x64_bin.tar.gz -rm -f jdk-21.0.2/lib/src.zip -tar -czvf jdk-21.0.2.tar.gz jdk-21.0.2 -rm -rf jdk-21.0.2 +#!/usr/bin/env bash +# 先运行 prepare-jdk.sh 生成 jdk-21.0.2.tar.gz,再基于本地文件构建镜像 +set -euo pipefail +cd "$(dirname "$0")" + +./prepare-jdk.sh + IMAGE=registry.cn-shanghai.aliyuncs.com/odboy/kenaito:runtime-jdk21 docker build -t "${IMAGE}" . docker push "${IMAGE}" diff --git a/image/runtime-jdk21/prepare-jdk.sh b/image/runtime-jdk21/prepare-jdk.sh new file mode 100755 index 0000000..fcba46a --- /dev/null +++ b/image/runtime-jdk21/prepare-jdk.sh @@ -0,0 +1,27 @@ +#!/usr/bin/env bash +# 生成 jdk-21.0.2.tar.gz 供 Dockerfile 中 ADD 使用: +# 下载 OpenJDK 二进制包 → 解包 → 删除体积大的 lib/src.zip → 重新打包 → 清理中间文件 +# 产物已存在时直接复用,重复执行不会重新下载 +set -euo pipefail +cd "$(dirname "$0")" + +VERSION=21.0.2 +PKG=jdk-${VERSION}.tar.gz +SRC_PKG=openjdk-${VERSION}_linux-x64_bin.tar.gz +URL=https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/${SRC_PKG} + +if [ -f "${PKG}" ]; then + echo "${PKG} 已存在,跳过" + exit 0 +fi + +if [ ! -f "${SRC_PKG}" ]; then + curl -fL -o "${SRC_PKG}" "${URL}" +fi + +tar -xzf "${SRC_PKG}" +rm -f "jdk-${VERSION}/lib/src.zip" +tar -czf "${PKG}" "jdk-${VERSION}" +rm -rf "jdk-${VERSION}" "${SRC_PKG}" + +./build.sh