From 868376930f1f17cc201af81a023debd647d164a1 Mon Sep 17 00:00:00 2001 From: Endial Fang Date: Tue, 20 Jan 2026 15:04:12 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=B8=BA=20v11.0.29+7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 67 +++++++++++++++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/Dockerfile b/Dockerfile index 26cdeff..a92b712 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,30 +1,32 @@ -# Ver: 1.10 by Endial Fang (endial@126.com) +# Ver: 1.12 by Endial Fang (endial@126.com) # # 系统默认变量 ==================================================================== # 该部分变量为系统根据编译命令默认设置 - -# `TARGETPLATFORM`：构建后的目标平台信息。如 `linux/amd64`，`linux/arm/v7`，`windows/amd64` +# `TARGETPLATFORM`：构建后的目标平台信息。如 `linux/amd64`，`linux/arm/v7`，`windows/amd64` # `TARGETOS`：目标平台信息（TARGETPLATFORM）中的操作系统部分，如：`linux`、`windows` # `TARGETARCH`：目标平台信息（TARGETPLATFORM）中的平台架构部分，如：`amd64`、`arm` # `TARGETVARIANT`：目标平台信息（TARGETPLATFORM）中的版本变体部分，如：`v7` # `BUILDPLATFORM`：用于构建的节点平台信息 # `BUILDOS`：用于构建的节点平台信息（BUILDPLATFORM）中的操作系统部分 -# `BUILDARCH`用于构建的节点平台信息（BUILDPLATFORM）中的平台架构部分 -# `BUILDVARIANT`用于构建的节点平台信息（BUILDPLATFORM）中的版本变体部分 +# `BUILDARCH`：用于构建的节点平台信息（BUILDPLATFORM）中的平台架构部分 +# `BUILDVARIANT`：用于构建的节点平台信息（BUILDPLATFORM）中的版本变体部分 # 可变参数 ======================================================================== # 该部分变量，在编译命令中通过 `--build-arg` 传入；如果未设置，则使用下面对应的默认值 +# 依赖镜像下载地址: docker.io (默认) / swr.cn-north-4.myhuaweicloud.com/colovu/ +# apt源: default / aliyun / ustc +# 软件包本地服务器: http://pkgs.colovu.com/dist -ARG APP_NAME=openjre # 设置当前应用名称 -ARG APP_VER=11.0.20 # 设置当前应用版本 -ARG APP_VER_SUB=8 # 设置当前应用的子版本版本 -ARG REGISTRY_URL="docker.colovu.com/" # 设置默认仓库地址，默认为本地仓库；定义时需要包含末尾的`/` -ARG APT_SOURCE=aliyun # 设置 apt-get 源：default / ustc / aliyun -ARG LOCAL_URL="http://local.colovu.com/dist" # 编译镜像时指定用于加速的本地软件包存储服务器地址 +ARG APP_NAME=openjre +ARG APP_VER=11.0.29 +ARG APP_VER_SUB=7 +ARG REGISTRY_URL="swr.cn-north-4.myhuaweicloud.com/colovu/" +ARG APT_SOURCE=aliyun +ARG LOCAL_URL="" # 0. 预处理 ====================================================================== -FROM --platform=${TARGETPLATFORM:-linux/amd64} ${REGISTRY_URL}colovu/dbuilder:12 as builder +FROM ${REGISTRY_URL}debian-builder:v13 AS builder # 声明需要使用的全局可变参数 ARG APP_NAME @@ -41,13 +43,15 @@ RUN select_source ${APT_SOURCE}; WORKDIR /tmp # 下载并解压软件包 -# https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.20%2B8/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.20_8.tar.gz -# https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.20%2B8/OpenJDK11U-jre_x64_linux_hotspot_11.0.20_8.tar.gz +# https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.29%2B7/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.29_7.tar.gz +# https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.29%2B7/OpenJDK11U-jre_x64_linux_hotspot_11.0.29_7.tar.gz RUN set -eux; \ - if [ "$TARGETARCH" = "arm64" ]]; \ - then appArch=aarch64; \ - else appArch=x64; \ - fi; \ + case "$TARGETARCH" in \ + amd64) appArch=x64 ;; \ + arm64) appArch=aarch64 ;; \ + arm) appArch=armhf ;; \ + *) echo "Unsupported architecture: $TARGETARCH" >&2; exit 1 ;; \ + esac; \ appName=OpenJDK11U-jre_${appArch}_linux_hotspot_${APP_VER}_${APP_VER_SUB}.tar.gz; \ [ -n ${LOCAL_URL} ] && localURL=${LOCAL_URL}/openjdk; \ appUrls="${localURL:-} \ @@ -58,7 +62,7 @@ RUN set -eux; \ rm -rf /usr/local/${APP_NAME}/man; # 1. 生成镜像 ===================================================================== -FROM --platform=${TARGETPLATFORM:-linux/amd64} ${REGISTRY_URL}colovu/debian:12 +FROM ${REGISTRY_URL}debian:v13 # 声明需要使用的全局可变参数（ARG声明的变量仅编译打包阶段有效） ARG APP_NAME @@ -74,32 +78,32 @@ ENV JAVA_HOME=/usr/local/${APP_NAME} \ LANG=zh_CN.UTF-8 \ PATH="${PATH}:/usr/local/${APP_NAME}/bin" -LABEL \ - "Version"="v${APP_VER}" \ - "Description"="Docker image for ${APP_NAME}." \ - "Github"="https://github.com/colovu/docker-${APP_NAME}" \ - "Vendor"="Endial Fang (endial@126.com)" +# 镜像元数据标签 - 符合OCI镜像规范 +LABEL org.opencontainers.image.title="${APP_NAME}" \ + org.opencontainers.image.version="${APP_VER}" \ + org.opencontainers.image.description="Docker image for OpenJRE" \ + org.opencontainers.image.authors="Endial Fang " \ + org.opencontainers.image.url="https://gitee.com/colovu/docker-${APP_NAME}" \ + org.opencontainers.image.vendor="Endial Fang (colovu)" \ + org.opencontainers.image.licenses="Apache-2.0" \ + org.opencontainers.image.source="https://gitee.com/colovu/docker-${APP_NAME}" \ + org.opencontainers.image.documentation="https://gitee.com/colovu/docker-${APP_NAME}/blob/main/README.md" \ + maintainer="Endial Fang " # 拷贝多阶段构建结果输出及客制化脚本 COPY --from=builder /usr/local/${APP_NAME} /usr/local/${APP_NAME} RUN set -eux; \ \ - # 创建对应的用户及数据存储目录 - \ - # 选择软件包源，以加速后续软件包安装 select_source ${APT_SOURCE}; \ \ - # 安装应用依赖的软件包及库 install_pkg p11-kit ca-certificates dmidecode; \ \ - # 增加中文支持，并配置 locale 为 zh_CN.UTF-8 sed -i -e 's/# zh_CN.UTF-8 UTF-8/zh_CN.UTF-8 UTF-8/' /etc/locale.gen; \ locale-gen; \ update-locale LC_ALL=zh_CN.UTF-8 LANG=zh_CN.UTF-8 LANGUAGE=zh_CN.UTF-8 LC_MESSAGES=POSIX; \ dpkg-reconfigure -f noninteractive locales; \ \ - # 更新 OpenJDK 绑定的证书 # 8-jdk uses "${JAVA_HOME}/jre/lib/security/cacerts" and # 8-jre and 11+ uses "${JAVA_HOME}/lib/security/cacerts" directly (no "jre" directory) { \ @@ -113,18 +117,15 @@ RUN set -eux; \ chmod +x /etc/ca-certificates/update.d/docker-openjdk; \ /etc/ca-certificates/update.d/docker-openjdk; \ \ - # 更新库搜索路径 find "${JAVA_HOME}/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \ ldconfig; \ \ # 解决应用安装jre-headless时错误：update-alternatives: error: error creating symbolic link '/usr/share/man/man mkdir -p /usr/share/man/man1; \ \ - # 执行后处理脚本 overrideShell="/usr/local/overrides/overrides-${APP_VER}.sh"; \ [ -e "${overrideShell}" ] && /bin/bash "${overrideShell}"; \ \ - # 验证安装的应用 java --version; # 应用程序的启动命令，可为应用程序可执行命令或脚本