feat: 解决仅能使用master标签生成镜像Tag的问题，优化Dockerfile
This commit is contained in:
+78
-62
@@ -1,34 +1,45 @@
|
||||
# Ver: 1.8 by Endial Fang (endial@126.com)
|
||||
# Ver: 1.9 by Endial Fang (endial@126.com)
|
||||
#
|
||||
|
||||
# 默认变量 ========================================================================
|
||||
# 该部分变量为系统根据编译命令默认设置
|
||||
|
||||
# `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）中的版本变体部分
|
||||
|
||||
# 可变参数 ========================================================================
|
||||
# 该部分变量，在编译命令中通过 `--build-arg` 传入；如果未设置，则使用下面对应的默认值
|
||||
|
||||
# 设置当前应用名称及版本
|
||||
ARG app_name=postgresql
|
||||
ARG app_version=12.4
|
||||
ARG APP_NAME=postgresql
|
||||
ARG APP_VER=13.11
|
||||
|
||||
# 设置默认仓库地址，默认为 阿里云 仓库
|
||||
ARG registry_url="registry.cn-shenzhen.aliyuncs.com"
|
||||
# 设置默认仓库地址，默认为本地仓库；定义时需要包含末尾的`/`
|
||||
ARG REGISTRY_URL="docker.colovu.com/"
|
||||
|
||||
# 设置 apt-get 源：default / tencent / ustc / aliyun / huawei
|
||||
ARG apt_source=aliyun
|
||||
|
||||
# 编译镜像时指定用于加速的本地服务器地址
|
||||
ARG local_url=""
|
||||
# 设置 apt-get 源：default / ustc / aliyun
|
||||
ARG APT_SOURCE=aliyun
|
||||
|
||||
# 编译镜像时指定用于加速的本地软件包存储服务器地址
|
||||
ARG LOCAL_URL="http://local.colovu.com/dist"
|
||||
|
||||
# 0. 预处理 ======================================================================
|
||||
FROM ${registry_url}/colovu/dbuilder as builder
|
||||
FROM --platform=${TARGETPLATFORM:-linux/amd64} ${REGISTRY_URL}colovu/dbuilder:12 as builder
|
||||
|
||||
# 声明需要使用的全局可变参数
|
||||
ARG app_name
|
||||
ARG app_version
|
||||
ARG registry_url
|
||||
ARG apt_source
|
||||
ARG local_url
|
||||
ARG APP_NAME
|
||||
ARG APP_VER
|
||||
ARG APT_SOURCE
|
||||
ARG LOCAL_URL
|
||||
|
||||
# 选择软件包源(Optional)，以加速后续软件包安装
|
||||
RUN select_source ${apt_source};
|
||||
RUN select_source ${APT_SOURCE};
|
||||
|
||||
# 安装依赖的软件包及库(Optional)
|
||||
RUN install_pkg bison flex libedit-dev libxml2-dev libxslt-dev zlib1g-dev libreadline-dev uuid-dev \
|
||||
@@ -39,17 +50,18 @@ WORKDIR /tmp
|
||||
|
||||
# 下载并解压软件包
|
||||
RUN set -eux; \
|
||||
appName="${app_name}-${app_version}.tar.bz2"; \
|
||||
sha256="bee93fbe2c32f59419cb162bcc0145c58da9a8644ee154a30b9a5ce47de606cc"; \
|
||||
[ ! -z ${local_url} ] && localURL=${local_url}/${app_name}; \
|
||||
appName="${APP_NAME}-${APP_VER}.tar.gz"; \
|
||||
sha256="b4f009f76cbc6c78e1e215eb78b2be4681240b861bdbb10cf36b0df7b2b75cac"; \
|
||||
[ -n ${LOCAL_URL} ] && localURL=${LOCAL_URL}/${APP_NAME}; \
|
||||
appUrls="${localURL:-} \
|
||||
https://ftp.postgresql.org/pub/source/v${app_version} \
|
||||
https://ftp.postgresql.org/pub/source/v${APP_VER} \
|
||||
"; \
|
||||
download_pkg unpack ${appName} "${appUrls}" -s "${sha256}";
|
||||
|
||||
# 源码编译
|
||||
RUN set -eux; \
|
||||
APP_SRC="/tmp/${app_name}-${app_version}"; \
|
||||
APP_ARCH=`arch` \
|
||||
APP_SRC="/tmp/${APP_NAME}-${APP_VER}"; \
|
||||
cd ${APP_SRC}; \
|
||||
\
|
||||
# update "DEFAULT_PGSOCKET_DIR" to "/var/run/postgresql" (matching Debian)
|
||||
@@ -64,8 +76,10 @@ RUN set -eux; \
|
||||
\
|
||||
# configure options taken from:
|
||||
# https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5
|
||||
LDFLAGS="-L/usr/local/lib -L/usr/lib/${APP_ARCH}-linux-gnu" \
|
||||
CPPFLAGS="-I/usr/local/include -D_GNU_SOURCE" \
|
||||
./configure \
|
||||
--prefix=/usr/local/${app_name} \
|
||||
--prefix=/usr/local/${APP_NAME} \
|
||||
--build="$gnuArch" \
|
||||
--enable-integer-datetimes \
|
||||
--enable-thread-safety \
|
||||
@@ -100,75 +114,76 @@ RUN set -eux; \
|
||||
# 删除编译生成的多余文件
|
||||
RUN set -eux; \
|
||||
find /usr/local -name '*.a' -delete; \
|
||||
rm -rf /usr/local/${app_name}/include;
|
||||
rm -rf /usr/local/${APP_NAME}/include;
|
||||
|
||||
# 检测并生成依赖文件记录
|
||||
RUN set -eux; \
|
||||
find /usr/local/${app_name} -type f -executable -exec ldd '{}' ';' | \
|
||||
find /usr/local/${APP_NAME} -type f -executable -exec ldd '{}' ';' | \
|
||||
awk '/=>/ { print $(NF-1) }' | \
|
||||
sort -u | \
|
||||
xargs -r readlink -f | \
|
||||
xargs -r dpkg-query --search 2>/dev/null | \
|
||||
cut -d: -f1 | \
|
||||
sort -u >/usr/local/${app_name}/runDeps;
|
||||
|
||||
sort -u >>/usr/local/${APP_NAME}/runDeps;
|
||||
|
||||
# 1. 生成镜像 =====================================================================
|
||||
FROM ${registry_url}/colovu/debian:buster
|
||||
FROM --platform=${TARGETPLATFORM:-linux/amd64} ${REGISTRY_URL}colovu/debian:12
|
||||
|
||||
# 声明需要使用的全局可变参数
|
||||
ARG app_name
|
||||
ARG app_version
|
||||
ARG registry_url
|
||||
ARG apt_source
|
||||
ARG local_url
|
||||
# 声明需要使用的全局可变参数（ARG声明的变量仅编译打包阶段有效）
|
||||
ARG APP_NAME
|
||||
ARG APP_VER
|
||||
ARG APT_SOURCE
|
||||
|
||||
# 镜像所包含应用的基础信息，定义环境变量，供后续脚本使用
|
||||
ENV APP_NAME=${app_name} \
|
||||
# 定义应用的基础信息变量（ENV声明的变量实例化后容器内有效）
|
||||
ENV APP_NAME=${APP_NAME} \
|
||||
APP_VER=${APP_VER} \
|
||||
APP_EXEC=postgres \
|
||||
APP_VERSION=${app_version}
|
||||
|
||||
ENV APP_HOME_DIR=/usr/local/${APP_NAME} \
|
||||
APP_HOME_DIR=/usr/local/${APP_NAME} \
|
||||
APP_DEF_DIR=/etc/${APP_NAME}
|
||||
|
||||
# 增加应用可执行文件及库文件搜索路径
|
||||
ENV PATH="${APP_HOME_DIR}/sbin:${APP_HOME_DIR}/bin:${PATH}" \
|
||||
LD_LIBRARY_PATH="${APP_HOME_DIR}/lib"
|
||||
|
||||
LABEL \
|
||||
"Version"="v${app_version}" \
|
||||
"Description"="Docker image for ${app_name}(v${app_version})." \
|
||||
"Dockerfile"="https://github.com/colovu/docker-${app_name}" \
|
||||
"Version"="v${APP_VER}" \
|
||||
"Description"="Docker image for ${APP_NAME}." \
|
||||
"Github"="https://github.com/colovu/docker-${APP_NAME}" \
|
||||
"Vendor"="Endial Fang (endial@126.com)"
|
||||
|
||||
# 从预处理过程中拷贝软件包(Optional)，可以使用阶段编号或阶段命名定义来源
|
||||
COPY --from=0 /usr/local/${APP_NAME} /usr/local/${APP_NAME}
|
||||
COPY --from=builder /usr/local/${APP_NAME} /usr/local/${APP_NAME}
|
||||
|
||||
# 拷贝应用使用的客制化脚本，并创建对应的用户及数据存储目录
|
||||
# 拷贝应用使用的客制化脚本
|
||||
COPY customer /
|
||||
|
||||
RUN set -eux; \
|
||||
prepare_env;
|
||||
|
||||
# 选择软件包源(Optional)，以加速后续软件包安装
|
||||
RUN select_source ${apt_source}
|
||||
|
||||
# 安装依赖的软件包及库(Optional)
|
||||
RUN install_pkg `cat /usr/local/${APP_NAME}/runDeps`;
|
||||
|
||||
# 执行预处理脚本，并验证安装的软件包
|
||||
RUN set -eux; \
|
||||
override_file="/usr/local/overrides/overrides-${APP_VERSION}.sh"; \
|
||||
\
|
||||
# 创建对应的用户及数据存储目录
|
||||
prepare_env; \
|
||||
\
|
||||
# 选择软件包源(Optional)，以加速后续软件包安装
|
||||
select_source ${APT_SOURCE}; \
|
||||
\
|
||||
# 安装依赖的软件包及库(Optional)
|
||||
install_pkg `cat /usr/local/${APP_NAME}/runDeps`; \
|
||||
\
|
||||
# 执行后处理脚本，并验证安装的应用
|
||||
override_file="/usr/local/overrides/overrides-${APP_VER}.sh"; \
|
||||
[ -e "${override_file}" ] && /bin/bash "${override_file}"; \
|
||||
${APP_EXEC} --version ;
|
||||
postgres --version ; \
|
||||
repmgr --version ;
|
||||
|
||||
# 默认提供的数据卷
|
||||
VOLUME ["/srv/conf", "/srv/data", "/srv/datalog", "/srv/cert", "/var/log"]
|
||||
|
||||
# 默认non-root用户启动，必须保证端口在1024之上
|
||||
# 默认使用gosu切换为新建用户启动，必须保证端口在1024之上
|
||||
EXPOSE 5432
|
||||
|
||||
# 关闭基础镜像的健康检查
|
||||
#HEALTHCHECK NONE
|
||||
|
||||
# 应用健康状态检查
|
||||
# 应用健康状态检查（需要使用 EXPOSE 定义的端口）
|
||||
#HEALTHCHECK --interval=30s --timeout=30s --retries=3 \
|
||||
# CMD curl -fs http://localhost:8080/ || exit 1
|
||||
#HEALTHCHECK --interval=10s --timeout=10s --retries=3 \
|
||||
@@ -181,9 +196,10 @@ USER 1001
|
||||
# 设置工作目录
|
||||
WORKDIR /srv/data
|
||||
|
||||
# 容器初始化命令
|
||||
ENTRYPOINT ["/usr/local/bin/entry.sh"]
|
||||
# 容器入口命令脚本，'/usr/local/bin/entry.sh'
|
||||
ENTRYPOINT ["entry.sh"]
|
||||
|
||||
# 应用程序的启动命令，必须使用非守护进程方式运行
|
||||
CMD ["/usr/local/bin/run.sh"]
|
||||
# 应用程序的启动命令，可为应用程序可执行命令或脚本
|
||||
# 必须使用非守护进程方式运行，'/usr/local/bin/run.sh'
|
||||
CMD ["run.sh"]
|
||||
|
||||
|
||||
Reference in New Issue
Block a user