build(deploy): builder 加 BuildKit cache mount,修正 cargo 管道吞退出码
registry/git/target 三个 mount,源码不变时跳过依赖重编;cache mount 内容不进 镜像层,.so 先复制到 /out,runtime 改从 /out 取。 原写法 `cargo build 2>&1 | tail -15` 的退出码取自 tail,cargo 失败会被判成功 并缓存坏层,改为落日志 + 失败打尾部 + 非零退出。
This commit is contained in:
1 parent
bcf5f07969
commit
84311e2be8
1 file changed
+17
-2
+17
-2
@@ -59,7 +59,22 @@ ENV NGINX_SOURCE_DIR=/src/nginx-1.30.4
|
||||
ENV NGINX_BUILD_DIR=/src/nginx-1.30.4/objs
|
||||
ENV CARGO_TARGET_DIR=/build/rust/target
|
||||
|
||||
RUN cargo build --release 2>&1 | tail -15
|
||||
# 依赖下载与编译中间产物都落在 BuildKit cache mount(不进镜像层、跨构建复用):
|
||||
# registry/git 缓存 crate 下载,target 缓存依赖 rlib —— 源码不变时二次构建跳过重编
|
||||
# (冷编十几分钟 → 命中后 1~2 分钟)。
|
||||
# ⚠️ target 是 cache mount,内容不会进入镜像层,所以 .so 必须复制到普通路径 /out,
|
||||
# 再由 runtime 阶段 COPY --from=builder /out/...(否则 COPY 找不到文件)。
|
||||
# ⚠️ 原写法 `cargo build ... 2>&1 | tail -15` 的退出码取自 tail,cargo 失败会被判
|
||||
# 成功并缓存坏层;改为落日志 + 失败打尾部再非零退出(ipass-all 同款修正)。
|
||||
RUN --mount=type=cache,id=ipass-cargo-registry,target=/usr/local/cargo/registry,sharing=locked \
|
||||
--mount=type=cache,id=ipass-cargo-git,target=/usr/local/cargo/git,sharing=locked \
|
||||
--mount=type=cache,id=ipass-sso-cargo-target,target=/build/rust/target,sharing=locked \
|
||||
set -eu; \
|
||||
cargo build --release > /tmp/cargo-build.log 2>&1 \
|
||||
|| { tail -30 /tmp/cargo-build.log; exit 1; }; \
|
||||
tail -3 /tmp/cargo-build.log; \
|
||||
mkdir -p /out; \
|
||||
cp /build/rust/target/release/libipass_sso_gateway.so /out/
|
||||
|
||||
# ===========================================================================
|
||||
# runtime: 极简镜像,只带 nginx 二进制 + 模块 + 静态资源 + 种子数据
|
||||
@@ -83,7 +98,7 @@ 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/libipass_sso_gateway.so /usr/local/nginx/modules/
|
||||
COPY --from=builder /out/libipass_sso_gateway.so /usr/local/nginx/modules/
|
||||
|
||||
# 生产配置(deploy/nginx.conf:全插件 location 布局 + 非 root 适配)
|
||||
COPY deploy/nginx.conf /usr/local/nginx/conf/nginx.conf
|
||||
|
||||
Reference in new issue
Block a user