From 443c94c555411c78338644c384a88babd8cd1642 Mon Sep 17 00:00:00 2001 From: Endial Fang Date: Thu, 3 Aug 2023 11:05:28 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=E9=85=8D=E7=BD=AE=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 145 +++++++++++++++++++++-------------------------------- Makefile | 14 +++--- 2 files changed, 65 insertions(+), 94 deletions(-) diff --git a/Dockerfile b/Dockerfile index b17e8c7..00c480e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,85 +1,62 @@ -# 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=nginx -ARG app_version=1.18.0 +ARG APP_NAME=nginx +ARG APP_VER=1.20.2 -# 设置默认仓库地址，默认为 阿里云 仓库 -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="" # 0. 预处理 ====================================================================== -FROM ${registry_url}/colovu/dbuilder as builder +FROM --platform=${TARGETPLATFORM:-linux/amd64} ${REGISTRY_URL}colovu/dbuilder:11 as builder # 声明需要使用的全局可变参数 -ARG app_name -ARG app_version -ARG registry_url -ARG apt_source -ARG local_url +ARG APP_NAME +ARG APP_VER +ARG REGISTRY_URL +ARG APT_SOURCE +ARG LOCAL_URL # 选择软件包源(Optional)，以加速后续软件包安装 -RUN select_source ${apt_source}; +RUN select_source ${APT_SOURCE}; # 安装依赖的软件包及库(Optional) -RUN install_pkg autoconf automake gcc-multilib - -RUN install_pkg zlib1g-dev zlib1g \ - libxml2-dev libxml2 \ - libxslt1-dev libxslt1.1 \ - libgd-dev libgd3 \ - libc6-dev libc6 \ - libgeoip-dev geoip-bin geoip-database \ - libterm-readkey-perl - -ENV OPENSSL_VERSION=1.1.1e -ENV PCRE_VERSION=8.44 -ENV HTTP_FLV_VERSION=1.2.7 +RUN install_pkg libpcre3 libpcre3-dev \ + zlib1g zlib1g-dev \ + libxslt1.1 libxslt1-dev \ + libgd3 libgd-dev \ + libxml2 libxml2-dev \ + geoip-bin geoip-database libgeoip-dev # 设置工作目录 WORKDIR /tmp -# 下载并解压软件包 openssl -RUN set -eux; \ - appName="openssl-${OPENSSL_VERSION}.tar.gz"; \ - [ ! -z ${local_url} ] && localURL=${local_url}/openssl; \ - appUrls="${localURL:-} \ - https://www.openssl.org/source/old/1.1.1 \ - "; \ - download_pkg unpack ${appName} "${appUrls}"; - -# 下载并解压软件包 pcre -RUN set -eux; \ - appName="pcre-${PCRE_VERSION}.tar.gz"; \ - [ ! -z ${local_url} ] && localURL=${local_url}/pcre; \ - appUrls="${localURL:-} \ - https://sourceforge.net/projects/pcre/files/pcre/${PCRE_VERSION} \ - https://jaist.dl.sourceforge.net/project/pcre/pcre/${PCRE_VERSION} \ - "; \ - download_pkg unpack ${appName} "${appUrls}"; - -# 下载并解压软件包 flv -RUN set -eux; \ - appName="v${HTTP_FLV_VERSION}.tar.gz"; \ - [ ! -z ${local_url} ] && localURL=${local_url}/nginx-http-flv; \ - appUrls="${localURL:-} \ - https://github.com/winshining/nginx-http-flv-module/archive \ - "; \ - download_pkg unpack ${appName} "${appUrls}"; - # 下载并解压软件包 nginx RUN set -eux; \ - appName="${app_name}-${app_version}.tar.gz"; \ - [ ! -z ${local_url} ] && localURL=${local_url}/nginx; \ + appName="${APP_NAME}-${APP_VER}.tar.gz"; \ + [ ! -z ${LOCAL_URL} ] && localURL=${LOCAL_URL}/nginx; \ appUrls="${localURL:-} \ http://nginx.org/download \ "; \ @@ -87,27 +64,25 @@ RUN set -eux; \ # 源码编译: 编译后将配置文件模板拷贝至 /usr/local/${app_name}/share/${app_name} 中 RUN set -eux; \ - APP_SRC="/tmp/${app_name}-${app_version}"; \ + APP_SRC="/tmp/${APP_NAME}-${APP_VER}"; \ cd ${APP_SRC}; \ ./configure \ --prefix=/usr/local/nginx \ - --conf-path=/usr/local/nginx/etc/nginx/nginx.conf \ + --sbin-path=/usr/local/nginx/sbin/nginx \ + --conf-path=/etc/nginx/nginx.conf \ + --pid-path=/var/run/nginx/nginx.pid \ + --lock-path=/var/run/nginx/nginx.lock \ --http-log-path=/var/log/nginx/access.log \ --error-log-path=/var/log/nginx/error.log \ --modules-path=/usr/local/nginx/modules \ - --pid-path=/var/run/nginx/nginx.pid \ - --lock-path=/var/run/nginx/nginx.lock \ --http-client-body-temp-path=/var/cache/nginx/client_temp \ --http-proxy-temp-path=/var/cache/nginx/proxy_temp \ --http-fastcgi-temp-path=/var/cache/nginx/fastcgi_temp \ --http-uwsgi-temp-path=/var/cache/nginx/uwsgi_temp \ --http-scgi-temp-path=/var/cache/nginx/scgi_temp \ \ - --with-pcre=/tmp/pcre-$PCRE_VERSION \ + --with-pcre \ --with-pcre-jit \ - --add-module=/tmp/nginx-http-flv-module-$HTTP_FLV_VERSION \ - --with-http_flv_module \ - --with-openssl=/tmp/openssl-$OPENSSL_VERSION \ --with-http_ssl_module \ --with-http_v2_module \ --with-http_realip_module \ @@ -129,8 +104,7 @@ RUN set -eux; \ --with-poll_module \ --with-mail \ ; \ - make -j "$(nproc)"; \ - make install; \ + make -j "$(nproc)" && make install; \ strip /usr/local/nginx/sbin/nginx; # 生成默认 PHP 首页文件 @@ -141,28 +115,25 @@ RUN set -eux; \ # 检测并生成依赖文件记录 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 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:11 # 声明需要使用的全局可变参数 -ARG app_name -ARG app_version -ARG registry_url -ARG apt_source -ARG local_url +ARG APP_NAME +ARG APP_VER +ARG REGISTRY_URL +ARG APT_SOURCE +ARG LOCAL_URL # 镜像所包含应用的基础信息，定义环境变量，供后续脚本使用 -ENV APP_NAME=${app_name} \ - APP_EXEC=${app_name} \ - APP_VERSION=${app_version} +ENV APP_EXEC=${APP_NAME} ENV APP_HOME_DIR=/usr/local/${APP_NAME} \ APP_DEF_DIR=/etc/${APP_NAME} @@ -171,9 +142,9 @@ 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)，可以使用阶段编号或阶段命名定义来源 @@ -186,14 +157,14 @@ RUN set -eux; \ /bin/bash -c "ln -sf /usr/local/${APP_NAME}/etc/${APP_NAME} /etc/"; # 选择软件包源(Optional)，以加速后续软件包安装 -RUN select_source ${apt_source} +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"; \ + override_file="/usr/local/overrides/overrides-${APP_VER}.sh"; \ [ -e "${override_file}" ] && /bin/bash "${override_file}"; \ ${APP_EXEC} -V ; diff --git a/Makefile b/Makefile index 2b2677f..5bd9f82 100644 --- a/Makefile +++ b/Makefile @@ -6,24 +6,24 @@ image_name :=colovu/nginx # 定义默认镜像仓库地址 -registry_url :=docker.io +REGISTRY_URL :=docker.colovu.com -# 定义系统默认使用的源服务器，包含：default / tencent / ustc / aliyun / huawei -apt_source :=tencent +# 定义系统默认使用的源服务器，包含：default / ustc / aliyun +APT_SOURCE :=aliyun # 定义镜像TAG，类似： -# <镜像名>:<分支名>-<7位Git ID> # Git 仓库且无文件修改直接编译 +# <镜像名>:<分支名>-<7位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) image_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) -build-arg:=--build-arg registry_url=$(registry_url) -build-arg+=--build-arg apt_source=$(apt_source) +build-arg:=--build-arg REGISTRY_URL=$(REGISTRY_URL) +build-arg+=--build-arg APT_SOURCE=$(APT_SOURCE) # 设置本地下载服务器路径，加速调试时的本地编译速度 local_ip:=`echo "en0 eth0" | xargs -n1 ip addr show 2>/dev/null | grep inet | grep -v 127.0.0.1 | grep -v inet6 | tr "/" " " | awk '{print $$2}'` -build-arg+=--build-arg local_url=http://$(local_ip)/dist-files +build-arg+=--build-arg LOCAL_URL=http://$(local_ip)/dist-files .PHONY: build clean clearclean upgrade