[fix:8]更新使用新的Dockerfile架构；删除jre，仅保留jdk
This commit is contained in:
+70
@@ -0,0 +1,70 @@
|
||||
# Ver: 1.2 by Endial Fang (endial@126.com)
|
||||
#
|
||||
FROM colovu/dbuilder as builder
|
||||
|
||||
# sources.list 可使用版本：default / tencent / ustc / aliyun / huawei
|
||||
ARG apt_source=tencent
|
||||
|
||||
# 编译镜像时指定用于加速的本地服务器地址
|
||||
ARG local_url=""
|
||||
RUN set -eux; \
|
||||
appVersion=8u262b10; \
|
||||
appName=OpenJDK8U-jdk_x64_linux_${appVersion}.tar.gz; \
|
||||
appKeys="0xCA5F11C6CE22644D42C6AC4492EF8D39DC13168F 0xEAC843EBD3EFDB98CC772FADA5CD6035332FA671"; \
|
||||
[ -n ${local_url} ] && localURL=${local_url}/openjdk; \
|
||||
appUrls="${localURL:-} \
|
||||
https://github.com/AdoptOpenJDK/openjdk8-upstream-binaries/releases/download/jdk8u262-b10 \
|
||||
"; \
|
||||
download_pkg unpack ${appName} "${appUrls}" -g "${appKeys}";
|
||||
|
||||
# 镜像生成 ========================================================================
|
||||
FROM colovu/debian:10
|
||||
ARG apt_source=default
|
||||
ARG local_url=""
|
||||
|
||||
ENV JAVA_VERSION=8u262-b10 \
|
||||
JAVA_HOME=/usr/local/openjdk8
|
||||
|
||||
ENV JRE_HOME="${JAVA_HOME}/jre" \
|
||||
CLASSPATH="${JAVA_HOME}/lib:${JAVA_HOME}/jre/lib" \
|
||||
PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin:${PATH}"
|
||||
|
||||
LABEL \
|
||||
"Version"="v${JAVA_VERSION}" \
|
||||
"Description"="Docker image for openJRE v${JAVA_VERSION}." \
|
||||
"Dockerfile"="https://github.com/colovu/docker-openjre" \
|
||||
"Vendor"="Endial Fang (endial@126.com)"
|
||||
|
||||
RUN select_source ${apt_source}
|
||||
RUN install_pkg p11-kit ca-certificates
|
||||
|
||||
RUN mkdir -p ${JAVA_HOME}
|
||||
COPY --from=builder /usr/local/openjdk-8u262-b10/ ${JAVA_HOME}
|
||||
|
||||
# 更新 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)
|
||||
RUN set -eux; \
|
||||
{ \
|
||||
echo '#!/usr/bin/env bash'; \
|
||||
echo 'set -Eeuo pipefail'; \
|
||||
echo 'if ! [ -d "${JAVA_HOME}" ]; then echo >&2 "error: missing JAVA_HOME environment variable"; exit 1; fi'; \
|
||||
echo 'cacertsFile=; for f in "${JAVA_HOME}/lib/security/cacerts" "${JAVA_HOME}/jre/lib/security/cacerts"; do if [ -e "$f" ]; then cacertsFile="$f"; break; fi; done'; \
|
||||
echo 'if [ -z "$cacertsFile" ] || ! [ -f "$cacertsFile" ]; then echo >&2 "error: failed to find cacerts file in ${JAVA_HOME}"; exit 1; fi'; \
|
||||
echo 'trust extract --overwrite --format=java-cacerts --filter=ca-anchors --purpose=server-auth "$cacertsFile"'; \
|
||||
} > /etc/ca-certificates/update.d/docker-openjdk; \
|
||||
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; \
|
||||
\
|
||||
# 验证安装的软件是否可以正常运行，常规情况下放置在命令行的最后
|
||||
java -version;
|
||||
|
||||
WORKDIR /
|
||||
|
||||
CMD []
|
||||
@@ -1,17 +1,52 @@
|
||||
# Ver: 1.0 by Endial Fang (endial@126.com)
|
||||
# Ver: 1.4 by Endial Fang (endial@126.com)
|
||||
#
|
||||
# 当前 Docker 镜像的编译脚本
|
||||
|
||||
current_branch := $(shell git rev-parse --abbrev-ref HEAD)
|
||||
app_name :=colovu/openjdk
|
||||
|
||||
# 生成镜像TAG，类似：
|
||||
# <镜像名>:<分支名>-<Git ID> # Git 仓库且无文件修改直接编译
|
||||
# <镜像名>:<分支名>-<年月日>-<时分秒> # Git 仓库有文件修改后的编译
|
||||
# <镜像名>:latest-<年月日>-<时分秒> # 非 Git 仓库编译
|
||||
current_subversion:=$(shell if [ ! `git status >/dev/null 2>&1` ]; then git rev-parse --short HEAD; else date +%y%m%d-%H%M%S; fi)
|
||||
current_tag:=$(shell if [ ! `git status >/dev/null 2>&1` ]; then git rev-parse --abbrev-ref HEAD | sed -e 's/master/latest/'; else echo "latest"; fi)-$(current_subversion)
|
||||
|
||||
# Sources List: default / tencent / ustc / aliyun / huawei
|
||||
build-arg := --build-arg apt_source=tencent
|
||||
build-arg:=--build-arg apt_source=tencent
|
||||
|
||||
# 设置本地下载服务器路径，加速调试时的本地编译速度
|
||||
build-arg += --build-arg local_url=http://192.168.48.132/dist-files/
|
||||
local_ip:=`ifconfig -a|grep inet|grep -v 127.0.0.1|grep -v inet6|awk '{print $$2}'|tr -d "addr:"`
|
||||
build-arg+=--build-arg local_url=http://$(local_ip)/dist-files
|
||||
|
||||
build:
|
||||
docker rmi jdk:$(current_branch) || true
|
||||
docker rmi jre:$(current_branch) || true
|
||||
docker build --force-rm $(build-arg) -t jdk:$(current_branch) ./jdk
|
||||
docker build --force-rm $(build-arg) -t jre:$(current_branch) ./jre
|
||||
.PHONY: build build-debian build-alpine clean clearclean upgrade
|
||||
|
||||
build: build-alpine build-debian
|
||||
@echo "Build complete"
|
||||
|
||||
build-debian:
|
||||
@echo "Build $(app_name):$(current_tag)"
|
||||
@docker build --force-rm $(build-arg) -t $(app_name):$(current_tag) .
|
||||
@echo "Add tag: $(app_name):latest"
|
||||
@docker tag $(app_name):$(current_tag) $(app_name):latest
|
||||
|
||||
build-alpine:
|
||||
@echo "Build $(app_name):$(current_tag)-alpine"
|
||||
@docker build --force-rm $(build-arg) -t $(app_name):$(current_tag)-alpine ./alpine
|
||||
@echo "Add tag: $(app_name):latest-alpine"
|
||||
@docker tag $(app_name):$(current_tag)-alpine $(app_name):latest-alpine
|
||||
|
||||
# 清理悬空的镜像（无TAG）及停止的容器
|
||||
clean:
|
||||
@echo "Clean untaged images and stoped containers..."
|
||||
@docker ps -a | grep "Exited" | awk '{print $$1}' | xargs docker rm
|
||||
@docker images | grep '<none>' | awk '{print $$3}' | xargs docker rmi -f
|
||||
|
||||
# 为了防止删除前缀名相同的镜像，在过滤条件中加入一个空格进行过滤
|
||||
clearclean: clean
|
||||
@echo "Clean all images for current application..."
|
||||
@docker images | grep "$(app_name) " | awk '{print $$3}' | xargs docker rmi -f
|
||||
|
||||
# 更新所有 colovu 仓库的镜像
|
||||
upgrade:
|
||||
@echo "Upgrade all images..."
|
||||
@docker images | grep 'colovu' | grep -v '<none>' | grep -v "latest-" | awk '{print $$1":"$$2}' | sort -u | xargs -L 1 docker pull
|
||||
|
||||
Reference in New Issue
Block a user