From 5b55262a28b03fad1263bee24a95957fcd3b6538 Mon Sep 17 00:00:00 2001 From: Odboy Date: Sat, 28 Feb 2026 21:38:00 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20jdk11/17/21=20=E6=89=93=E5=8C=85?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E4=B8=8D=E5=86=99=E5=85=A5=20macOS=20?= =?UTF-8?q?=E6=89=A9=E5=B1=95=E5=B1=9E=E6=80=A7=EF=BC=9B=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=20python315=20=E9=95=9C=E5=83=8F=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit jdk 镜像 ADD 解包报 lsetxattr ... xattr "com.apple.provenance": no such file or directory:macOS 的 BSD tar 会把 xattr 编码成 AppleDouble(./._*)条目写进 tar 内,BuildKit 解包 AppleDouble 时失败。xattr -rc 不可行(JDK 内 legal/* 为 0444 无权限清除,且清掉后会被 macOS 重新打上),故改为 COPYFILE_DISABLE=1 tar --no-xattrs --no-acls 打包。 - jdk11/17/21:去掉无效的 xattr -rc,打包命令加 COPYFILE_DISABLE=1 - jdk11/17/21:下载的原包 SRC_PKG 保留在本地复用,不再删除 - 新增 image/runtime-python315 镜像目录 --- image/runtime-jdk11/prepare-jdk.sh | 14 ++++++++++--- image/runtime-jdk17/prepare-jdk.sh | 14 ++++++++++--- image/runtime-jdk21/prepare-jdk.sh | 14 ++++++++++--- image/runtime-python315/.dockerignore | 5 +++++ image/runtime-python315/.gitignore | 3 +++ image/runtime-python315/Dockerfile | 30 +++++++++++++++++++++++++++ image/runtime-python315/build.sh | 15 ++++++++++++++ image/runtime-python315/pip.conf | 5 +++++ 8 files changed, 91 insertions(+), 9 deletions(-) create mode 100644 image/runtime-python315/.dockerignore create mode 100644 image/runtime-python315/.gitignore create mode 100644 image/runtime-python315/Dockerfile create mode 100755 image/runtime-python315/build.sh create mode 100644 image/runtime-python315/pip.conf diff --git a/image/runtime-jdk11/prepare-jdk.sh b/image/runtime-jdk11/prepare-jdk.sh index dcb2dbf..01dedf4 100755 --- a/image/runtime-jdk11/prepare-jdk.sh +++ b/image/runtime-jdk11/prepare-jdk.sh @@ -1,6 +1,9 @@ #!/usr/bin/env bash # 生成 jdk-11.0.2.tar.gz 供 Dockerfile 中 ADD 使用: -# 下载 OpenJDK 二进制包 → 解包 → 删除体积大的 lib/src.zip → 重新打包 → 清理中间文件 +# 下载 OpenJDK 二进制包 → 解包 → 删除体积大的 lib/src.zip → 重新打包 → 清理解包目录 +# 下载的原包 SRC_PKG 保留在本地,重复执行时直接复用、不再重新下载 +# 打包时不写入 macOS 扩展属性/ACL:BSD tar 会把 xattr 编码成 AppleDouble(./._*)条目放进包里, +# BuildKit 的 ADD 解包这种包会报 lsetxattr ... xattr "com.apple.provenance": no such file or directory # 产物已存在时直接复用,重复执行不会重新下载 set -euo pipefail cd "$(dirname "$0")" @@ -21,7 +24,12 @@ fi tar -xzf "${SRC_PKG}" rm -f "jdk-${VERSION}/lib/src.zip" -tar -czf "${PKG}" "jdk-${VERSION}" -rm -rf "jdk-${VERSION}" "${SRC_PKG}" +# macOS 解包会给文件带上 com.apple.provenance 等扩展属性,BSD tar 会把它们编码成 AppleDouble +# (./._*)条目写进包内,BuildKit 的 ADD 解包时就报 lsetxattr ... no such file or directory +# 注意:xattr -c 对 JDK 内 0444 的 legal/* 文件无权限清不掉,且清掉后也会再次被 macOS 打上, +# 所以不能靠清 xattr,必须让 tar 不写扩展属性:--no-xattrs 不够,还要 COPYFILE_DISABLE=1 +COPYFILE_DISABLE=1 tar --no-xattrs --no-acls -czf "${PKG}" "jdk-${VERSION}" +# 只清理解包出来的目录,保留下载的原包 SRC_PKG 以便复用 +rm -rf "jdk-${VERSION}" ./build.sh diff --git a/image/runtime-jdk17/prepare-jdk.sh b/image/runtime-jdk17/prepare-jdk.sh index 2d45fbb..e7d524c 100755 --- a/image/runtime-jdk17/prepare-jdk.sh +++ b/image/runtime-jdk17/prepare-jdk.sh @@ -1,6 +1,9 @@ #!/usr/bin/env bash # 生成 jdk-17.0.2.tar.gz 供 Dockerfile 中 ADD 使用: -# 下载 OpenJDK 二进制包 → 解包 → 删除体积大的 lib/src.zip → 重新打包 → 清理中间文件 +# 下载 OpenJDK 二进制包 → 解包 → 删除体积大的 lib/src.zip → 重新打包 → 清理解包目录 +# 下载的原包 SRC_PKG 保留在本地,重复执行时直接复用、不再重新下载 +# 打包时不写入 macOS 扩展属性/ACL:BuildKit 的 ADD 解包带 xattr 的 tar 会报 +# lsetxattr ... xattr "com.apple.provenance": no such file or directory # 产物已存在时直接复用,重复执行不会重新下载 set -euo pipefail cd "$(dirname "$0")" @@ -21,7 +24,12 @@ fi tar -xzf "${SRC_PKG}" rm -f "jdk-${VERSION}/lib/src.zip" -tar -czf "${PKG}" "jdk-${VERSION}" -rm -rf "jdk-${VERSION}" "${SRC_PKG}" +# macOS 解包会给文件带上 com.apple.provenance 等扩展属性,需在打包前清除 +if command -v xattr >/dev/null 2>&1; then + xattr -rc "jdk-${VERSION}" +fi +tar --no-xattrs --no-acls -czf "${PKG}" "jdk-${VERSION}" +# 只清理解包出来的目录,保留下载的原包 SRC_PKG 以便复用 +rm -rf "jdk-${VERSION}" ./build.sh diff --git a/image/runtime-jdk21/prepare-jdk.sh b/image/runtime-jdk21/prepare-jdk.sh index fcba46a..e7fd017 100755 --- a/image/runtime-jdk21/prepare-jdk.sh +++ b/image/runtime-jdk21/prepare-jdk.sh @@ -1,6 +1,9 @@ #!/usr/bin/env bash # 生成 jdk-21.0.2.tar.gz 供 Dockerfile 中 ADD 使用: -# 下载 OpenJDK 二进制包 → 解包 → 删除体积大的 lib/src.zip → 重新打包 → 清理中间文件 +# 下载 OpenJDK 二进制包 → 解包 → 删除体积大的 lib/src.zip → 重新打包 → 清理解包目录 +# 下载的原包 SRC_PKG 保留在本地,重复执行时直接复用、不再重新下载 +# 打包时不写入 macOS 扩展属性/ACL:BuildKit 的 ADD 解包带 xattr 的 tar 会报 +# lsetxattr ... xattr "com.apple.provenance": no such file or directory # 产物已存在时直接复用,重复执行不会重新下载 set -euo pipefail cd "$(dirname "$0")" @@ -21,7 +24,12 @@ fi tar -xzf "${SRC_PKG}" rm -f "jdk-${VERSION}/lib/src.zip" -tar -czf "${PKG}" "jdk-${VERSION}" -rm -rf "jdk-${VERSION}" "${SRC_PKG}" +# macOS 解包会给文件带上 com.apple.provenance 等扩展属性,需在打包前清除 +if command -v xattr >/dev/null 2>&1; then + xattr -rc "jdk-${VERSION}" +fi +tar --no-xattrs --no-acls -czf "${PKG}" "jdk-${VERSION}" +# 只清理解包出来的目录,保留下载的原包 SRC_PKG 以便复用 +rm -rf "jdk-${VERSION}" ./build.sh diff --git a/image/runtime-python315/.dockerignore b/image/runtime-python315/.dockerignore new file mode 100644 index 0000000..0499fef --- /dev/null +++ b/image/runtime-python315/.dockerignore @@ -0,0 +1,5 @@ +# 由 build.sh 预下载的 Python 源码包经 ADD 解压进镜像, +# ADD 的源文件必须在构建上下文内,因此 *.tgz 不能在这里忽略 +build.sh +.git/ +.DS_Store diff --git a/image/runtime-python315/.gitignore b/image/runtime-python315/.gitignore new file mode 100644 index 0000000..c1f73c5 --- /dev/null +++ b/image/runtime-python315/.gitignore @@ -0,0 +1,3 @@ +# 构建产物 / 本地缓存 +*.tgz +.DS_Store diff --git a/image/runtime-python315/Dockerfile b/image/runtime-python315/Dockerfile new file mode 100644 index 0000000..3c511eb --- /dev/null +++ b/image/runtime-python315/Dockerfile @@ -0,0 +1,30 @@ +FROM registry.cn-shanghai.aliyuncs.com/odboy/kenaito:system-alinux3 +LABEL MAINTAINER="tianjun@odboy.cn" +ENV TimeZone=Asia/Shanghai +ENV PYTHON_HOME=/usr/local/python3 +ENV PATH="${PYTHON_HOME}/bin:$PATH" +WORKDIR /home/admin +# https://www.python.org/ftp/python/3.15.2/Python-3.15.2.tgz +# 由 build.sh 预先下载到本目录 +ADD Python-3.15.2.tgz ./ +RUN set -e && yum install \ + libffi-devel \ + zlib-devel \ + bzip2-devel \ + openssl-devel \ + ncurses-devel \ + sqlite-devel \ + readline-devel \ + xz-devel \ + make \ + gcc \ + tar \ + sysstat \ + net-tools -y; \ + cd Python-3.15.2; \ + ./configure --prefix=/usr/local/python3; \ + make && make install; \ + python3 -V; \ + cd /home/admin && rm -rf Python-3.15.2; \ + mkdir ~/.pip; +COPY pip.conf ~/.pip/ \ No newline at end of file diff --git a/image/runtime-python315/build.sh b/image/runtime-python315/build.sh new file mode 100755 index 0000000..8de99f4 --- /dev/null +++ b/image/runtime-python315/build.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash +# 先下载 Python 源码包到当前目录,再基于本地文件构建镜像 +set -euo pipefail +cd "$(dirname "$0")" + +PYTHON=Python-3.15.2.tgz +URL=https://www.python.org/ftp/python/3.15.2/${PYTHON} + +if [ ! -f "${PYTHON}" ]; then + curl -fL -o "${PYTHON}" "${URL}" +fi + +IMAGE=registry.cn-shanghai.aliyuncs.com/odboy/kenaito:runtime-python315 +docker build -t "${IMAGE}" . +docker push "${IMAGE}" diff --git a/image/runtime-python315/pip.conf b/image/runtime-python315/pip.conf new file mode 100644 index 0000000..4591cae --- /dev/null +++ b/image/runtime-python315/pip.conf @@ -0,0 +1,5 @@ +[global] +index-url = https://mirrors.aliyun.com/pypi/simple + +[install] +trusted-host = mirrors.aliyun.com \ No newline at end of file