[fix:11]更正在线编译脚本中软件包下载路径错误
This commit is contained in:
+9
-6
@@ -5,7 +5,8 @@
|
||||
|
||||
# 设置当前应用名称及版本
|
||||
ARG app_name=openjdk
|
||||
ARG app_version=11.0.8_10
|
||||
ARG app_version=11.0.8
|
||||
ARG app_subver=10
|
||||
|
||||
# 设置默认仓库地址,默认为 阿里云 仓库
|
||||
ARG registry_url="registry.cn-shenzhen.aliyuncs.com"
|
||||
@@ -23,6 +24,7 @@ FROM ${registry_url}/colovu/dbuilder as builder
|
||||
# 声明需要使用的全局可变参数
|
||||
ARG app_name
|
||||
ARG app_version
|
||||
ARG app_subver
|
||||
ARG registry_url
|
||||
ARG apt_source
|
||||
ARG local_url
|
||||
@@ -38,11 +40,11 @@ WORKDIR /tmp
|
||||
|
||||
# 下载并解压软件包
|
||||
RUN set -eux; \
|
||||
appName=OpenJDK11U-jdk_x64_linux_${app_version}.tar.gz; \
|
||||
appName=OpenJDK11U-jdk_x64_linux_${app_version}_${app_subver}.tar.gz; \
|
||||
appKeys="0xCA5F11C6CE22644D42C6AC4492EF8D39DC13168F 0xEAC843EBD3EFDB98CC772FADA5CD6035332FA671"; \
|
||||
[ -n ${local_url} ] && localURL=${local_url}/openjdk; \
|
||||
appUrls="${localURL:-} \
|
||||
https://github.com/AdoptOpenJDK/openjdk11-upstream-binaries/releases/download/jdk-${app_version}%2B10 \
|
||||
https://github.com/AdoptOpenJDK/openjdk11-upstream-binaries/releases/download/jdk-${app_version}%2B${app_subver} \
|
||||
"; \
|
||||
download_pkg unpack ${appName} "${appUrls}";
|
||||
|
||||
@@ -52,6 +54,7 @@ FROM ${registry_url}/colovu/debian:buster
|
||||
# 声明需要使用的全局可变参数
|
||||
ARG app_name
|
||||
ARG app_version
|
||||
ARG app_subver
|
||||
ARG registry_url
|
||||
ARG apt_source
|
||||
ARG local_url
|
||||
@@ -74,7 +77,7 @@ LABEL \
|
||||
"Vendor"="Endial Fang (endial@126.com)"
|
||||
|
||||
# 从预处理过程中拷贝软件包(Optional),可以使用阶段编号或阶段命名定义来源
|
||||
COPY --from=builder /tmp/openjdk-${APP_VERSION} ${JAVA_HOME}
|
||||
COPY --from=builder /tmp/openjdk-${APP_VERSION}_${app_subver} ${JAVA_HOME}
|
||||
|
||||
# 选择软件包源(Optional),以加速后续软件包安装
|
||||
RUN select_source ${apt_source}
|
||||
@@ -107,8 +110,8 @@ RUN set -eux; \
|
||||
RUN set -eux; \
|
||||
override_file="/usr/local/overrides/overrides-${APP_VERSION}.sh"; \
|
||||
[ -e "${override_file}" ] && /bin/bash "${override_file}"; \
|
||||
java -version; \
|
||||
javac -version;
|
||||
java --version; \
|
||||
javac --version;
|
||||
|
||||
# 设置工作目录
|
||||
WORKDIR /srv
|
||||
|
||||
Reference in New Issue
Block a user