[feat]更新脚本组织结构

This commit is contained in:
2020-12-17 11:00:05 +08:00
parent 2156409165
commit ec23acf9bc
24 changed files with 575 additions and 364 deletions
+51 -37
View File
@@ -1,18 +1,23 @@
# Ver: 1.2 by Endial Fang (endial@126.com)
# Ver: 1.4 by Endial Fang (endial@126.com)
#
# 预处理 =========================================================================
FROM colovu/dbuilder as builder
ARG registry_url="registry.cn-shenzhen.aliyuncs.com"
FROM ${registry_url}/colovu/dbuilder as builder
# sources.list 可使用版本:default / tencent / ustc / aliyun / huawei
ARG apt_source=default
ARG apt_source=aliyun
# 编译镜像时指定用于加速的本地服务器地址
ARG local_url=""
WORKDIR /usr/local
ENV APP_NAME=test \
APP_VERSION=1.0.0
# 选择软件包源(Optional),以加速后续软件包安装
RUN select_source ${apt_source};
# 安装依赖的软件包及库(Optional)
#RUN install_pkg xz-utils
# 下载并解压软件包
@@ -21,7 +26,7 @@ RUN select_source ${apt_source};
# appName=gosu-"$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \
# appKeys="0xB42F6819007F00F88E364FD4036A9C25BF357DD4"; \
# sha256="04fa1fddc39bd1aecb6739dd5dd73858a3515b427acd1e2947a66dadce868d68"; \
# [ ! -z ${local_url} ] && localURL=${local_url}/gosu; \
# [ ! -z ${local_url} ] && localURL=${local_url}/${APP_NAME}; \
# appUrls="${localURL:-} \
# https://github.com/tianon/gosu/releases/download/${appVersion} \
# "; \
@@ -29,42 +34,51 @@ RUN select_source ${apt_source};
# download_pkg unpack ${appName} "${appUrls}"; \
# chmod +x /usr/local/bin/${appName};
# 源码编译软件包
# 源码编译: 编译后将配置文件模板拷贝至 /usr/local/${APP_NAME}/share/${APP_NAME} 中
#RUN set -eux; \
# 源码编译方式安装: 编译后将原始配置文件拷贝至 ${APP_DEF_DIR} 中
# mkdir -p /usr/local/${APP_NAME}; \
# APP_SRC="/usr/local/${APP_NAME}-${APP_VERSION}"; \
# cd ${APP_SRC}; \
# ./configure ; \
# ./configure \
# --prefix=/usr/local/${APP_NAME} \
# ; \
# make -j "$(nproc)"; \
# make PREFIX=/usr/local/${APP_NAME} install; \
# cp -rf ./conf/* ${APP_DEF_DIR}/;
# make PREFIX=/usr/local/${APP_NAME} install;
# 删除编译生成的多余文件
RUN set -eux; \
find /usr/local -name '*.a' -delete; \
rm -rf /usr/local/${APP_NAME}/include;
# 检测并生成依赖文件记录
RUN set -eux; \
find /usr/local/${APP_NAME} -type f -executable -exec ldd '{}' ';' | \
awk '/=>/ { print $(NF-1) }' | \
sort -u | \
xargs -r dpkg-query --search | \
cut -d: -f1 | \
sort -u >/usr/local/${APP_NAME}/runDeps;
#find /usr/local/redis/bin -type f -executable -exec ldd '{}' ';' | awk '/=>/ { print $(NF-1) }' | sort -u | xargs -r dpkg-query --search | cut -d: -f1 | sort -u
# 镜像生成 ========================================================================
FROM colovu/debian:10
FROM ${registry_url}/colovu/debian:10
ARG apt_source=default
# sources.list 可使用版本:default / tencent / ustc / aliyun / huawei
ARG apt_source=aliyun
# 编译镜像时指定用于加速的本地服务器地址
ARG local_url=""
# 镜像所包含应用的基础信息
ENV APP_NAME=test \
APP_USER=builder \
APP_EXEC=/bin/bash \
APP_EXEC=run.sh \
APP_VERSION=1.0.0
ENV APP_HOME_DIR=/usr/local/${APP_NAME} \
APP_DEF_DIR=/etc/${APP_NAME} \
APP_CONF_DIR=/srv/conf/${APP_NAME} \
APP_DATA_DIR=/srv/data/${APP_NAME} \
APP_DATA_LOG_DIR=/srv/datalog/${APP_NAME} \
APP_CACHE_DIR=/var/cache/${APP_NAME} \
APP_RUN_DIR=/var/run/${APP_NAME} \
APP_LOG_DIR=/var/log/${APP_NAME} \
APP_CERT_DIR=/srv/cert/${APP_NAME}
APP_DEF_DIR=/etc/${APP_NAME}
ENV \
PATH="${APP_HOME_DIR}/bin:${PATH}"
ENV PATH="${APP_HOME_DIR}/bin:${APP_HOME_DIR}/sbin:${PATH}" \
LD_LIBRARY_PATH="${APP_HOME_DIR}/lib"
LABEL \
"Version"="v${APP_VERSION}" \
@@ -72,25 +86,27 @@ LABEL \
"Dockerfile"="https://github.com/colovu/docker-${APP_NAME}" \
"Vendor"="Endial Fang (endial@126.com)"
# 拷贝应用使用的客制化脚本,并创建对应的用户及数据存储目录
COPY customer /
# 以包管理方式安装软件包(Optional)
RUN select_source ${apt_source}
#RUN install_pkg bash tini sudo libssl1.1
RUN create_user && prepare_env
# 从预处理过程中拷贝软件包(Optional)
#COPY --from=0 /usr/local/bin/gosu-amd64 /usr/local/bin/gosu
#COPY --from=builder /usr/local/redis /usr/local/redis
#COPY --from=builder /usr/local/bin/gosu-amd64 /usr/local/bin/gosu
# 从预处理过程中拷贝软件包(Optional),可以使用阶段编号或阶段命名定义来源
#COPY --from=0 /usr/local/${APP_NAME}/ /usr/local/${APP_NAME}
#COPY --from=builder /usr/local/${APP_NAME}/ /usr/local/${APP_NAME}
# 选择软件包源(Optional),以加速后续软件包安装
RUN select_source ${apt_source}
# 安装依赖的软件包及库(Optional)
#RUN install_pkg `cat /usr/local/${APP_NAME}/runDeps`;
#RUN install_pkg bash tini sudo libssl1.1
# 执行预处理脚本,并验证安装的软件包
RUN set -eux; \
override_file="/usr/local/overrides/overrides-${APP_VERSION}.sh"; \
[ -e "${override_file}" ] && /bin/bash "${override_file}"; \
gosu ${APP_USER} ${APP_EXEC} --version ; \
:;
gosu --version;
# 默认提供的数据卷
VOLUME ["/srv/conf", "/srv/data", "/srv/datalog", "/srv/cert", "/var/log"]
@@ -101,8 +117,6 @@ EXPOSE 8080
# 容器初始化命令,默认存放在:/usr/local/bin/entry.sh
ENTRYPOINT ["entry.sh"]
WORKDIR /srv/data
# 应用程序的服务命令,必须使用非守护进程方式运行。如果使用变量,则该变量必须在运行环境中存在(ENV可以获取)
CMD ["${APP_EXEC}"]