[fix]重命名customer脚本;优化readme.md文档
This commit is contained in:
+35
-33
@@ -28,18 +28,17 @@ ARG apt_source
|
||||
ARG local_url
|
||||
|
||||
# 选择软件包源(Optional)，以加速后续软件包安装
|
||||
#RUN select_source ${apt_source};
|
||||
RUN select_source ${apt_source};
|
||||
|
||||
# 安装依赖的软件包及库(Optional)
|
||||
#RUN install_pkg xz-utils
|
||||
|
||||
# 设置工作目录
|
||||
WORKDIR /usr/local
|
||||
WORKDIR /tmp
|
||||
|
||||
# 下载并解压软件包
|
||||
#RUN set -eux; \
|
||||
# appVersion=1.12; \
|
||||
# appName=gosu-"$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \
|
||||
# appName=${app_name}-${app_version}.tgz; \
|
||||
# appKeys="0xB42F6819007F00F88E364FD4036A9C25BF357DD4"; \
|
||||
# sha256="04fa1fddc39bd1aecb6739dd5dd73858a3515b427acd1e2947a66dadce868d68"; \
|
||||
# [ ! -z ${local_url} ] && localURL=${local_url}/${app_name}; \
|
||||
@@ -50,33 +49,37 @@ WORKDIR /usr/local
|
||||
# download_pkg unpack ${appName} "${appUrls}"; \
|
||||
# chmod +x /usr/local/bin/${appName};
|
||||
|
||||
# 源码编译: 编译后将配置文件模板拷贝至 /usr/local/${app_name}/share/${app_name} 中
|
||||
# 源码编译
|
||||
#RUN set -eux; \
|
||||
# APP_SRC="/usr/local/${app_name}-${app_version}"; \
|
||||
# APP_SRC="/tmp/${app_name}-${app_version}"; \
|
||||
# cd ${APP_SRC}; \
|
||||
# ./configure \
|
||||
# --prefix=/usr/local/${app_name} \
|
||||
# --prefix=/usr/local \
|
||||
# CPPFLAGS="-I/usr/local/include -D_GNU_SOURCE" \
|
||||
# LDFLAGS="-L/usr/local/lib" \
|
||||
# ; \
|
||||
# make -j "$(nproc)"; \
|
||||
# make PREFIX=/usr/local/${app_name} install;
|
||||
# make install;
|
||||
|
||||
# 删除编译生成的多余文件
|
||||
RUN set -eux; \
|
||||
find /usr/local -name '*.a' -delete; \
|
||||
rm -rf /usr/local/${app_name}/include;
|
||||
rm -rf /usr/local/share; \
|
||||
rm -rf /usr/local/include; \
|
||||
rm -rf /usr/local/docs;
|
||||
|
||||
# 检测并生成依赖文件记录
|
||||
RUN set -eux; \
|
||||
find /usr/local/${app_name} -type f -executable -exec ldd '{}' ';' | \
|
||||
find /usr/local -type f -executable -exec ldd '{}' ';' | \
|
||||
awk '/=>/ { print $(NF-1) }' | \
|
||||
sort -u | \
|
||||
xargs -r dpkg-query --search | \
|
||||
xargs -r dpkg-query --search 2>/dev/null | \
|
||||
cut -d: -f1 | \
|
||||
sort -u >/usr/local/${APP_NAME}/runDeps;
|
||||
sort -u >/usr/local/runDeps;
|
||||
|
||||
|
||||
# 1. 生成镜像 =====================================================================
|
||||
FROM ${registry_url}/colovu/debian:10
|
||||
FROM ${registry_url}/colovu/debian:buster
|
||||
FROM ${registry_url}/colovu/openjre:8
|
||||
|
||||
# 声明需要使用的全局可变参数
|
||||
@@ -88,14 +91,13 @@ ARG local_url
|
||||
|
||||
# 镜像所包含应用的基础信息，定义环境变量，供后续脚本使用
|
||||
ENV APP_NAME=${app_name} \
|
||||
APP_USER=builder \
|
||||
APP_EXEC=run.sh \
|
||||
APP_EXEC=${app_name} \
|
||||
APP_VERSION=${app_version}
|
||||
|
||||
ENV APP_HOME_DIR=/usr/local/${APP_NAME} \
|
||||
APP_DEF_DIR=/etc/${APP_NAME}
|
||||
ENV APP_HOME_DIR=/usr/local \
|
||||
APP_DEF_DIR=/usr/local/etc/${APP_NAME}
|
||||
|
||||
ENV PATH="${APP_HOME_DIR}/bin:${APP_HOME_DIR}/sbin:${PATH}" \
|
||||
ENV PATH="${APP_HOME_DIR}/libexec:${PATH}" \
|
||||
LD_LIBRARY_PATH="${APP_HOME_DIR}/lib"
|
||||
|
||||
LABEL \
|
||||
@@ -106,25 +108,22 @@ LABEL \
|
||||
|
||||
# 拷贝应用使用的客制化脚本，并创建对应的用户及数据存储目录
|
||||
COPY customer /
|
||||
RUN create_user && prepare_env
|
||||
|
||||
# 从预处理过程中拷贝软件包(Optional)，可以使用阶段编号或阶段命名定义来源
|
||||
#COPY --from=0 /usr/local/${APP_NAME}/ /usr/local/${APP_NAME}
|
||||
#COPY --from=builder /usr/local/${APP_NAME}/ /usr/local/${APP_NAME}
|
||||
COPY --from=0 /usr/local/ /usr/local
|
||||
|
||||
# 选择软件包源(Optional)，以加速后续软件包安装
|
||||
#RUN select_source ${apt_source}
|
||||
RUN select_source ${apt_source}
|
||||
|
||||
# 安装依赖的软件包及库(Optional)
|
||||
#RUN install_pkg `cat /usr/local/${APP_NAME}/runDeps`;
|
||||
#RUN install_pkg bash tini sudo libssl1.1
|
||||
RUN install_pkg `cat /usr/local/runDeps`;
|
||||
#RUN install_pkg bash 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;
|
||||
${APP_EXEC} --version ;
|
||||
|
||||
# 默认提供的数据卷
|
||||
VOLUME ["/srv/conf", "/srv/data", "/srv/datalog", "/srv/cert", "/var/log"]
|
||||
@@ -136,13 +135,16 @@ EXPOSE 8080
|
||||
#HEALTHCHECK NONE
|
||||
|
||||
# 应用健康状态检查
|
||||
#HEALTHCHECK --interval=30 --timeout=30 --retries=3 \
|
||||
# CMD curl -fs http://localhost:9864/ || exit 1
|
||||
#HEALTHCHECK --interval=0 --timeout=0 --retries=0 \
|
||||
# CMD netstat -ltun | grep 10514
|
||||
#HEALTHCHECK --interval=30s --timeout=30s --retries=3 \
|
||||
# CMD curl -fs http://localhost:8080/ || exit 1
|
||||
#HEALTHCHECK --interval=10s --timeout=10s --retries=3 \
|
||||
# CMD netstat -ltun | grep 8080
|
||||
|
||||
# 容器初始化命令，默认存放在：/usr/local/bin/entry.sh
|
||||
# 使用 non-root 用户运行后续的命令
|
||||
USER 1001
|
||||
|
||||
# 容器初始化命令，默认存放在：/usr/local/bin
|
||||
ENTRYPOINT ["entry.sh"]
|
||||
|
||||
# 应用程序的服务命令，必须使用非守护进程方式运行。如果使用变量，则该变量必须在运行环境中存在（ENV可以获取）
|
||||
CMD ["${APP_EXEC}"]
|
||||
# 应用程序的启动命令，必须使用非守护进程方式运行。默认存放在：/usr/local/bin
|
||||
CMD ["run.sh"]
|
||||
|
||||
Reference in New Issue
Block a user