From 67a8e731cce9fe6c8f7916085755c83109bc8b47 Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 24 Sep 2026 16:27:05 +0800 Subject: [PATCH] =?UTF-8?q?feat(deploy):=20=E5=AE=B9=E5=99=A8=E5=8C=96?= =?UTF-8?q?=E6=9E=84=E5=BB=BA=EF=BC=88=E5=A4=9A=E9=98=B6=E6=AE=B5=20Docker?= =?UTF-8?q?file=20+=20compose=20+=20entrypoint=20+=20=E5=85=B1=E7=94=A8=20?= =?UTF-8?q?base=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 主镜像 Dockerfile:多阶段构建,复用 rust-nginx-base 镜像(nginx 1.30.4 + rust 1.89 + 已 configure 的 pcre/openssl/编译链),冷构建从 ~17min 压到 ~5min - deploy/nginx.conf:容器内 nginx 配置(端口 18098 / /usr/local/nginx/... 路径) - docker-compose.yml:本机一键起服务(端口 8881→18098)+ S10 健康探测 - scripts/container-entrypoint.sh:容器入口脚本(启动前 healthcheck 等) - .dockerignore:避免把 build/target/data/refs 误打进镜像 - deploy/Dockerfile.base:rust-nginx-base 镜像定义(apt 链 + nginx/pcre 源码 + 已 ./configure 过的源码树) - deploy/build-base-image.sh:构建并推送 base 镜像到阿里云 CR (crpi-yscq976uwza88qap.cn-shenzhen.personal.cr.aliyuncs.com/ssw188/nginx) --- .dockerignore | 23 ++++++ Dockerfile | 91 ++++++++++++++++++++++++ deploy/Dockerfile.base | 110 +++++++++++++++++++++++++++++ deploy/build-base-image.sh | 121 ++++++++++++++++++++++++++++++++ deploy/nginx.conf | 83 ++++++++++++++++++++++ docker-compose.yml | 39 ++++++++++ scripts/container-entrypoint.sh | 74 +++++++++++++++++++ 7 files changed, 541 insertions(+) create mode 100644 .dockerignore create mode 100644 Dockerfile create mode 100644 deploy/Dockerfile.base create mode 100755 deploy/build-base-image.sh create mode 100644 deploy/nginx.conf create mode 100644 docker-compose.yml create mode 100755 scripts/container-entrypoint.sh diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..45b09ee --- /dev/null +++ b/.dockerignore @@ -0,0 +1,23 @@ +# 构建上下文减脂:构建产物、依赖、版本控制一律不进镜像 +target/ +build/ +data/ +.git/ +.gitmodules +tests/ +docs/ +logs/ +.workbuddy/ +*.md +*.bak +**/.DS_Store +**/*.log + +# 但 entrypoint / seed-data 必须进镜像 +!scripts/container-entrypoint.sh +!scripts/seed-data.sh + +# deps/ipass 是 cargo workspace 必需(ipass-core + plugin-domain + ngx-rust vendor) +# 只排除子模块内的 cargo target / .git,保留所有 build.rs 等源码 +deps/**/target/ +deps/**/.git/ diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..2c9b7fc --- /dev/null +++ b/Dockerfile @@ -0,0 +1,91 @@ +# ipass-sso 网关镜像 —— 多阶段构建(复用 rust-nginx-base) +# +# 设计: +# - builder 阶段:FROM crpi-yscq976uwza88qap.cn-shenzhen.personal.cr.aliyuncs.com/ssw188/nginx:1.30.4-rust-1.89 +# - base 镜像已含 rust 1.89 + 已 configure 的 nginx 1.30.4 + pcre 8.45 + apt 编译链 +# - 不需要再次 apt install / curl / configure nginx(这些已在 base 里完成) +# - 这里只跑 nginx make + cargo build --release +# - runtime 阶段:debian:bookworm-slim,只装运行时库 + COPY 编译产物 +# +# 加速效果:冷构建从 ~17min(apt + curl + configure + cargo)压到 ~5min(仅 cargo build + make) +# +# 构建命令(context = sso 仓根): +# docker build -t ipass-sso:dev . +# +# 升级 nginx/rust 版本时:先跑 deploy/build-base-image.sh 推新 base,再 bump 此处 FROM 的 tag + +# syntax=docker/dockerfile:1.7 + +ARG NGINX_VERSION=1.30.4 +ARG BASE_TAG=1.30.4-rust-1.89 + +# =========================================================================== +# builder: 复用 rust-nginx-base + 编译 nginx 二进制 + Rust 模块 +# =========================================================================== +FROM crpi-yscq976uwza88qap.cn-shenzhen.personal.cr.aliyuncs.com/ssw188/nginx:${BASE_TAG} AS builder + +# ⚠️ ARG 必须每个 stage 内重新声明才能用 —— 顶层的 NGINX_VERSION 在 builder 内不可见 +ARG NGINX_VERSION=1.30.4 + +# base 镜像里 nginx 已 configure + make 过;这里只跑 Rust 模块编译 +# --- Rust 动态模块 ----------------------------------------------------------- +WORKDIR /build +COPY rust/ /build/rust/ +COPY deps/ /build/deps/ + +WORKDIR /build/rust +ENV NGINX_SOURCE_DIR=/src/nginx-${NGINX_VERSION} +ENV NGINX_BUILD_DIR=/src/nginx-${NGINX_VERSION}/objs +ENV CARGO_TARGET_DIR=/build/rust/target + +RUN cargo build --release 2>&1 | tail -10 + +# =========================================================================== +# runtime: 极简镜像,只带 nginx 二进制 + 模块 + 静态资源 +# =========================================================================== +FROM debian:bookworm-slim AS runtime + +ARG NGINX_VERSION=1.30.4 + +RUN apt-get update && apt-get install -y --no-install-recommends \ + libpcre2-8-0 \ + zlib1g \ + libssl3 \ + ca-certificates \ + curl \ + tzdata \ + python3 \ + && rm -rf /var/lib/apt/lists/* + +# 与 ipass 一致:容器默认 TZ=UTC,所有时间显示比北京慢 8h。 +# TZ=Asia/Shanghai 后 util::day_id 走 localtime_r 按上海时区 0:00 切日。 +ENV TZ=Asia/Shanghai + +COPY --from=builder /src/nginx-${NGINX_VERSION}/objs/nginx /usr/local/nginx/sbin/nginx +COPY --from=builder /src/nginx-${NGINX_VERSION}/conf/mime.types /usr/local/nginx/conf/mime.types +COPY --from=builder /build/rust/target/release/libsso_gateway.so /usr/local/nginx/modules/ + +# 配置 / 证书(生产证书随镜像分发;勿把镜像推到公共仓库) +# 用 deploy/nginx.conf 替代 sso 仓 conf/nginx.test.conf:后者引用 ipass_proxy +# (plugin-domain 注册),sso 模块不编译 plugin-domain。 +COPY deploy/nginx.conf /usr/local/nginx/conf/nginx.conf +COPY www/ /usr/local/nginx/www/ +COPY data-seed/ /usr/local/nginx/data-seed/ + +# 数据目录:worker 是 nobody(uid 65534),必须可写,否则 seed-data 落盘失败 +RUN mkdir -p /usr/local/nginx/data /usr/local/nginx/logs \ + && chown -R 65534:65534 /usr/local/nginx/data \ + && ln -sf /dev/stdout /usr/local/nginx/logs/access.log \ + && ln -sf /dev/stderr /usr/local/nginx/logs/error.log + +# 首次启动播种 admin/alice + 渲染配置 + 起 nginx +COPY scripts/container-entrypoint.sh /usr/local/nginx/scripts/container-entrypoint.sh +COPY scripts/seed-data.sh /usr/local/nginx/scripts/seed-data.sh +RUN chmod +x /usr/local/nginx/scripts/container-entrypoint.sh /usr/local/nginx/scripts/seed-data.sh + +WORKDIR /usr/local/nginx +EXPOSE 18098 +STOPSIGNAL SIGQUIT + +ENTRYPOINT ["/usr/local/nginx/scripts/container-entrypoint.sh"] +CMD ["nginx", "-g", "daemon off;"] diff --git a/deploy/Dockerfile.base b/deploy/Dockerfile.base new file mode 100644 index 0000000..03b0b11 --- /dev/null +++ b/deploy/Dockerfile.base @@ -0,0 +1,110 @@ +# ============================================================================ +# rust-nginx-base —— iPass / SSO / 任何 ngx-rust 项目共用的编译基础镜像 +# +# 包含: +# - rust:1.89-slim-bookworm(rust 工具链) +# - nginx 编译链:build-essential / libpcre2-dev / zlib1g-dev / libssl-dev +# - bindgen 依赖:clang / libclang-dev / pkg-config +# - 已下载 + ./configure 过的 nginx 1.30.4 源码树(/src/nginx-1.30.4/) +# objs/ 含 bindgen 所需头文件 +# - 已 configure 过的 pcre 8.45 源码树(/src/pcre-8.45/) +# +# 设计: +# - tag 版本号:1.30.4-rust-1.89(nginx 与 rust 任一升级都推新 tag) +# - 推到阿里云 CR:crpi-yscq976uwza88qap.cn-shenzhen.personal.cr.aliyuncs.com/ssw188/nginx +# - 复用方式:FROM crpi-.../nginx:1.30.4-rust-1.89 AS builder → 直接 cargo build +# +# 构建命令: +# docker build \ +# --build-context ngxbuild=../ipass/build/ngxbuild \ +# -f deploy/Dockerfile.base \ +# -t crpi-yscq976uwza88qap.cn-shenzhen.personal.cr.aliyuncs.com/ssw188/nginx:1.30.4-rust-1.89 \ +# . +# +# ============================================================================ + +# syntax=docker/dockerfile:1.7 + +ARG NGINX_VERSION=1.30.4 +ARG PCRE_VERSION=8.45 +ARG RUST_VERSION=1.89 + +FROM rust:${RUST_VERSION}-slim-bookworm + +ARG NGINX_VERSION +ARG PCRE_VERSION + +# nginx 编译链 + bindgen 依赖 + 下载工具(兜底用) +RUN apt-get update && apt-get install -y --no-install-recommends \ + build-essential \ + libpcre2-dev \ + zlib1g-dev \ + libssl-dev \ + clang \ + libclang-dev \ + pkg-config \ + curl \ + ca-certificates \ + xz-utils \ + git \ + && rm -rf /var/lib/apt/lists/* + +# --- nginx + pcre 源码:从 ngxbuild 上下文拷入 --- +# 约定:ngxbuild 上下文必须含 nginx-${NGINX_VERSION}.tar.gz 和 pcre-${PCRE_VERSION}.tar.gz +# 升级 nginx 版本时(NGINX_VERSION=1.30.5 等): +# 先 curl 到 ngxbuild 目录: +# curl -fsSL https://nginx.org/download/nginx-1.30.5.tar.gz -o ../ipass/build/ngxbuild/nginx-1.30.5.tar.gz +# curl -fsSL https://sourceforge.net/projects/pcre/files/pcre/8.45/pcre-8.45.tar.gz/download -o ../ipass/build/ngxbuild/pcre-8.45.tar.gz +WORKDIR /src +COPY --from=ngxbuild nginx-${NGINX_VERSION}.tar.gz /tmp/nginx-${NGINX_VERSION}.tar.gz +COPY --from=ngxbuild pcre-${PCRE_VERSION}.tar.gz /tmp/pcre-${PCRE_VERSION}.tar.gz + +RUN tar -xzf /tmp/nginx-${NGINX_VERSION}.tar.gz -C /src/ \ + && tar -xzf /tmp/pcre-${PCRE_VERSION}.tar.gz -C /src/ \ + && rm -f /tmp/nginx-${NGINX_VERSION}.tar.gz /tmp/pcre-${PCRE_VERSION}.tar.gz + +# --- nginx + pcre:configure + 触发 pcre 子构建(生成 pcre.h),但不编 nginx 二进制 ---- +# 为什么必须 make 一次: +# 1. ./configure 生成 objs/Makefile + ngx_auto_config.h(bindgen 头文件) +# 2. nginx 的 objs/Makefile 依赖 pcre.h(pcre-8.45/pcre.h)—— **不跑 make 就没 pcre.h** +# 3. cargo nginx-sys build.rs 直接读 pcre.h + ngx_*.h,缺一个就 fatal error +# 4. nginx make 的第一步是触发 pcre 子目录的 configure,生成 pcre.h +# 5. 但 nginx make 后续会真编 nginx 二进制(耗时)。这里只跑 make 的 pcre 子步骤: +# `make objs/Makefile` 触发 pcre 子 configure,但不全量编译 +# 等等——实测 nginx 1.30.4 的 objs/Makefile 不会因单纯 touch objs/Makefile 触发 pcre 子构建。 +# 必须实际跑 `make`(包括 nginx 二进制)。代价:base 多 30s,但下游 make 是纯增量(秒过)。 +WORKDIR /src/nginx-${NGINX_VERSION} +RUN ./configure \ + --prefix=/usr/local/nginx \ + --with-pcre=/src/pcre-${PCRE_VERSION} \ + --with-http_realip_module \ + --with-http_ssl_module \ + --without-http_ssi_module \ + --without-http_userid_module \ + --without-http_autoindex_module \ + --without-http_geo_module \ + --without-http_split_clients_module \ + --without-http_referer_module \ + --without-http_uwsgi_module \ + --without-http_scgi_module \ + --without-http_grpc_module \ + && make -j"$(nproc)" 2>&1 | tail -5 \ + && test -f /src/pcre-${PCRE_VERSION}/pcre.h \ + && test -f /src/nginx-${NGINX_VERSION}/objs/ngx_auto_config.h \ + && test -x /src/nginx-${NGINX_VERSION}/objs/nginx + +# --- 默认环境变量:让 FROM 此镜像的项目可以直接 cargo build ---- +# 使用镜像的项目 cargo build 前不必再设这两个变量 +ENV NGINX_SOURCE_DIR=/src/nginx-${NGINX_VERSION} +ENV NGINX_BUILD_DIR=/src/nginx-${NGINX_VERSION}/objs +ENV DEBIAN_FRONTEND=noninteractive + +# 标记镜像元数据(其他项目 FROM 时可看到 base 来源) +ARG BASE_VERSION="nginx-${NGINX_VERSION}-rust-${RUST_VERSION}" +LABEL org.opencontainers.image.title="rust-nginx-base" \ + org.opencontainers.image.description="ngx-rust 项目共用编译基础:rust 1.89 + 已 configure 的 nginx 1.30.4 + pcre 8.45" \ + org.opencontainers.image.source="http://192.168.1.18:13300/ipass/sso" \ + org.opencontainers.image.version="${BASE_VERSION}" + +WORKDIR /build +CMD ["/bin/bash"] \ No newline at end of file diff --git a/deploy/build-base-image.sh b/deploy/build-base-image.sh new file mode 100755 index 0000000..5b7b367 --- /dev/null +++ b/deploy/build-base-image.sh @@ -0,0 +1,121 @@ +#!/usr/bin/env bash +# ============================================================================ +# 构建并推送 rust-nginx-base 到阿里云 CR +# +# 用法: +# bash deploy/build-base-image.sh # 默认:nginx-1.30.4-rust-1.89 + latest +# bash deploy/build-base-image.sh --dry-run # 只构建,不推送 +# NGINX_VERSION=1.30.5 RUST_VERSION=1.90 bash ... # 升级 nginx/rust 版本时 +# +# 设计: +# - tag 形如 rust-nginx-base-nginx-1.30.4-rust-1.89,nginx/rust 任一升级都推新 tag +# - 同时打 latest(指向最近一次构建,便于开发快速引用) +# - 复用 ../ipass/build/ngxbuild 已下载的 nginx/pcre tarball(避免重复 curl) +# ============================================================================ +set -euo pipefail + +HERE="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +ROOT="$(cd "$HERE/.." && pwd)" + +REGISTRY="${REGISTRY:-crpi-yscq976uwza88qap.cn-shenzhen.personal.cr.aliyuncs.com}" +REPO="${REPO:-ssw188/nginx}" +NAME="${NAME:-}" + +NGINX_VERSION="${NGINX_VERSION:-1.30.4}" +RUST_VERSION="${RUST_VERSION:-1.89}" +PCRE_VERSION="${PCRE_VERSION:-8.45}" + +IMAGE_BASE="$REGISTRY/$REPO" +TAG_VERSIONED="${IMAGE_BASE}:${NGINX_VERSION}-rust-${RUST_VERSION}" +TAG_LATEST="${IMAGE_BASE}:rust-nginx-base-latest" + +DRY_RUN=0 +for a in "$@"; do + case "$a" in + --dry-run) DRY_RUN=1 ;; + *) echo "未知参数:$a" >&2; exit 2 ;; + esac +done + +c_ok() { printf '\033[32m✓\033[0m %s\n' "$*"; } +c_warn() { printf '\033[33m!\033[0m %s\n' "$*"; } +c_err() { printf '\033[31m✗\033[0m %s\n' "$*" >&2; } + +# ---------------------------------------------------------------- 前置检查 + 自动补齐 ngxbuild +NGXBUILD="${IPASS_NGXBUILD:-$ROOT/../ipass/build/ngxbuild}" +[ -d "$NGXBUILD" ] || { c_err "缺 ngxbuild 目录:$NGXBUILD"; exit 1; } + +# 缺 nginx tarball 自动 curl(避免 Dockerfile COPY 找不到源文件硬失败) +if [ ! -s "$NGXBUILD/nginx-${NGINX_VERSION}.tar.gz" ]; then + c_warn "ngxbuild 无 nginx-${NGINX_VERSION}.tar.gz,自动从 nginx.org 下载" + curl -fsSL "https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz" \ + -o "$NGXBUILD/nginx-${NGINX_VERSION}.tar.gz" \ + || { c_err "下载 nginx tarball 失败"; exit 1; } +fi + +# 缺 pcre tarball 自动 curl(sourceforge 慢,必要时手动预下) +if [ ! -s "$NGXBUILD/pcre-${PCRE_VERSION}.tar.gz" ]; then + c_warn "ngxbuild 无 pcre-${PCRE_VERSION}.tar.gz,自动从 sourceforge 下载" + curl -fsSL "https://sourceforge.net/projects/pcre/files/pcre/${PCRE_VERSION}/pcre-${PCRE_VERSION}.tar.gz/download" \ + -o "$NGXBUILD/pcre-${PCRE_VERSION}.tar.gz" \ + || { c_err "下载 pcre tarball 失败"; exit 1; } +fi + +# ---------------------------------------------------------------- docker login +echo "== 1/3 docker login ==" +if ! docker info >/dev/null 2>&1; then + c_err "docker 不可用"; exit 1 +fi +# 已登录则跳过(避免每次都输密码) +if ! docker manifest inspect "$TAG_VERSIONED" >/dev/null 2>&1; then + if [ -n "${CR_USER:-}" ] && [ -n "${CR_PASS:-}" ]; then + printf '%s' "$CR_PASS" | docker login "$REGISTRY" -u "$CR_USER" --password-stdin + else + c_warn "未登录 CR;如推送失败请设 CR_USER/CR_PASS 后重跑" + fi +fi + +# ---------------------------------------------------------------- 构建 +echo "== 2/3 docker build ==" +cd "$ROOT" +docker build \ + --build-context ngxbuild="$NGXBUILD" \ + --build-arg "NGINX_VERSION=$NGINX_VERSION" \ + --build-arg "RUST_VERSION=$RUST_VERSION" \ + --build-arg "PCRE_VERSION=$PCRE_VERSION" \ + -f deploy/Dockerfile.base \ + -t "$TAG_VERSIONED" \ + -t "$TAG_LATEST" \ + . +c_ok "已构建:$TAG_VERSIONED" +c_ok "已构建:$TAG_LATEST" + +# ---------------------------------------------------------------- 推送 +if [ "$DRY_RUN" = "1" ]; then + echo + echo "== DRY_RUN=1,跳过推送 ==" + echo " 下一步手动推:" + echo " docker push $TAG_VERSIONED" + echo " docker push $TAG_LATEST" + exit 0 +fi + +echo "== 3/3 docker push ==" +docker push "$TAG_VERSIONED" +docker push "$TAG_LATEST" + +cat <&2; } + +# ---------------------------------------------------------------- 0. 基础目录 +mkdir -p "$DATA_DIR" "$LOG_DIR" + +# ---------------------------------------------------------------- 1. 打印关键 env(排障) +printf '\n== ipass-sso 启动参数 ==\n' +c_ok "OAUTH_ISSUER = ${OAUTH_ISSUER:-<未设置,默认走 nginx.conf 占位>}" +c_ok "OAUTH_COOKIE_DOMAIN= ${OAUTH_COOKIE_DOMAIN:-<未设置>}" +c_ok "ADMIN_USER = ${ADMIN_USER:-admin}" +if [ -n "${ADMIN_PASSWORD:-}" ]; then + c_ok "ADMIN_PASSWORD = <已注入>" +else + c_warn "ADMIN_PASSWORD = <未注入>,seed 将使用默认 123456" +fi +if [ -n "${OAUTH_SIGNING_SECRET:-}" ]; then + c_ok "OAUTH_SIGNING_SECRET= <已注入>" +else + c_warn "OAUTH_SIGNING_SECRET= <未注入>,seed 将生成随机值(重启即丢!)" +fi + +# ---------------------------------------------------------------- 2. 数据物化(首次启动) +NEED_SEED=0 +[ ! -f "$DATA_DIR/users.json" ] && NEED_SEED=1 +[ ! -f "$DATA_DIR/oauth_clients.json" ] && NEED_SEED=1 + +if [ "$NEED_SEED" = "1" ]; then + printf '\n== 首次启动:seed-data.sh 物化 admin/alice ==\n' + # nginx worker 是 nobody(uid 65534),必须可写 + chown -R 65534:65534 "$DATA_DIR" 2>/dev/null || c_warn "chown 65534 失败(继续)" + + ADMIN_PASSWORD="${ADMIN_PASSWORD:-123456}" \ + ALICE_PASSWORD="${ALICE_PASSWORD:-alice123}" \ + DATA_DIR="$DATA_DIR" \ + SEED_DIR="$SEED_DIR" \ + bash /usr/local/nginx/scripts/seed-data.sh || \ + { c_err "seed-data.sh 失败"; exit 1; } + c_ok "data 目录物化完成" +else + c_ok "data 目录已有,跳过 seed" +fi + +# ---------------------------------------------------------------- 3. nginx 语法预检 +printf '\n== nginx -t ==\n' +/usr/local/nginx/sbin/nginx -t -c "$NGINX_CONF" 2>&1 || { c_err "nginx 配置语法错误"; exit 1; } + +# ---------------------------------------------------------------- 4. exec nginx(PID 1 拿信号) +printf '\n== 起 nginx ==\n' +exec /usr/local/nginx/sbin/nginx -c "$NGINX_CONF" -g 'daemon off;'