refactor: JDK 预下载逻辑抽到 prepare-jdk.sh,并加产物缓存判断
- 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
This commit is contained in:
@@ -0,0 +1,6 @@
|
|||||||
|
# 由 prepare-jdk.sh 生成的 jdk-*.tar.gz 经 ADD 解压进镜像,
|
||||||
|
# ADD 的源文件必须在构建上下文内,因此 *.tar.gz 不能在这里忽略
|
||||||
|
build.sh
|
||||||
|
prepare-jdk.sh
|
||||||
|
.git/
|
||||||
|
.DS_Store
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
# 构建产物 / 本地缓存
|
||||||
|
*.tar.gz
|
||||||
|
.DS_Store
|
||||||
Regular → Executable
+7
-6
@@ -1,9 +1,10 @@
|
|||||||
curl -O https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_linux-x64_bin.tar.gz
|
#!/usr/bin/env bash
|
||||||
tar -xzvf openjdk-11.0.2_linux-x64_bin.tar.gz
|
# 先运行 prepare-jdk.sh 生成 jdk-11.0.2.tar.gz,再基于本地文件构建镜像
|
||||||
rm -f openjdk-11.0.2_linux-x64_bin.tar.gz
|
set -euo pipefail
|
||||||
rm -f jdk-11.0.2/lib/src.zip
|
cd "$(dirname "$0")"
|
||||||
tar -czvf jdk-11.0.2.tar.gz jdk-11.0.2
|
|
||||||
rm -rf jdk-11.0.2
|
./prepare-jdk.sh
|
||||||
|
|
||||||
IMAGE=registry.cn-shanghai.aliyuncs.com/odboy/kenaito:runtime-jdk11
|
IMAGE=registry.cn-shanghai.aliyuncs.com/odboy/kenaito:runtime-jdk11
|
||||||
docker build -t "${IMAGE}" .
|
docker build -t "${IMAGE}" .
|
||||||
docker push "${IMAGE}"
|
docker push "${IMAGE}"
|
||||||
|
|||||||
Executable
+27
@@ -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
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
# 由 prepare-jdk.sh 生成的 jdk-*.tar.gz 经 ADD 解压进镜像,
|
||||||
|
# ADD 的源文件必须在构建上下文内,因此 *.tar.gz 不能在这里忽略
|
||||||
|
build.sh
|
||||||
|
prepare-jdk.sh
|
||||||
|
.git/
|
||||||
|
.DS_Store
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
# 构建产物 / 本地缓存
|
||||||
|
*.tar.gz
|
||||||
|
.DS_Store
|
||||||
Regular → Executable
+7
-6
@@ -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
|
#!/usr/bin/env bash
|
||||||
tar -xzvf openjdk-17.0.2_linux-x64_bin.tar.gz
|
# 先运行 prepare-jdk.sh 生成 jdk-17.0.2.tar.gz,再基于本地文件构建镜像
|
||||||
rm -f openjdk-17.0.2_linux-x64_bin.tar.gz
|
set -euo pipefail
|
||||||
rm -f jdk-17.0.2/lib/src.zip
|
cd "$(dirname "$0")"
|
||||||
tar -czvf jdk-17.0.2.tar.gz jdk-17.0.2
|
|
||||||
rm -rf jdk-17.0.2
|
./prepare-jdk.sh
|
||||||
|
|
||||||
IMAGE=registry.cn-shanghai.aliyuncs.com/odboy/kenaito:runtime-jdk17
|
IMAGE=registry.cn-shanghai.aliyuncs.com/odboy/kenaito:runtime-jdk17
|
||||||
docker build -t "${IMAGE}" .
|
docker build -t "${IMAGE}" .
|
||||||
docker push "${IMAGE}"
|
docker push "${IMAGE}"
|
||||||
|
|||||||
Executable
+27
@@ -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
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
# 由 prepare-jdk.sh 生成的 jdk-*.tar.gz 经 ADD 解压进镜像,
|
||||||
|
# ADD 的源文件必须在构建上下文内,因此 *.tar.gz 不能在这里忽略
|
||||||
|
build.sh
|
||||||
|
prepare-jdk.sh
|
||||||
|
.git/
|
||||||
|
.DS_Store
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
# 构建产物 / 本地缓存
|
||||||
|
*.tar.gz
|
||||||
|
.DS_Store
|
||||||
Regular → Executable
+7
-6
@@ -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
|
#!/usr/bin/env bash
|
||||||
tar -xzvf openjdk-21.0.2_linux-x64_bin.tar.gz
|
# 先运行 prepare-jdk.sh 生成 jdk-21.0.2.tar.gz,再基于本地文件构建镜像
|
||||||
rm -f openjdk-21.0.2_linux-x64_bin.tar.gz
|
set -euo pipefail
|
||||||
rm -f jdk-21.0.2/lib/src.zip
|
cd "$(dirname "$0")"
|
||||||
tar -czvf jdk-21.0.2.tar.gz jdk-21.0.2
|
|
||||||
rm -rf jdk-21.0.2
|
./prepare-jdk.sh
|
||||||
|
|
||||||
IMAGE=registry.cn-shanghai.aliyuncs.com/odboy/kenaito:runtime-jdk21
|
IMAGE=registry.cn-shanghai.aliyuncs.com/odboy/kenaito:runtime-jdk21
|
||||||
docker build -t "${IMAGE}" .
|
docker build -t "${IMAGE}" .
|
||||||
docker push "${IMAGE}"
|
docker push "${IMAGE}"
|
||||||
|
|||||||
Executable
+27
@@ -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
|
||||||
Reference in New Issue
Block a user