From eea0a15b9c6c3b6bba5b1bf12c9703b69f88eff7 Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 11 Sep 2026 16:11:25 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E7=BD=B2=E6=9E=84=E5=BB=BA=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=EF=BC=9A.dockerignore=20/=20.gitignore(deploy)=20/=20?= =?UTF-8?q?Dockerfile=20=E9=95=9C=E5=83=8F=E5=88=86=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 .dockerignore,构建上下文减脂(排除 build/tests/.run/data/logs/rust/target 等) - .gitignore 排除 deploy/:种子数据含 API Key 与上游真 Key,只进镜像不入库 - Dockerfile 将 conf/nginx.conf、conf/tls/、www/、deploy/data-seed/ 拷入镜像 凭据与正式证书不进版本库,随镜像分发时勿推公共仓库 --- .dockerignore | 14 ++++++++++++++ .gitignore | 3 +++ Dockerfile | 7 +++++++ 3 files changed, 24 insertions(+) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..f75d9bd --- /dev/null +++ b/.dockerignore @@ -0,0 +1,14 @@ +# 构建上下文减脂:构建树、回归运行态、本地状态一律不进镜像 +build/ +tests/ +logs/ +data/ +.workbuddy/ +.git/ +.gitignore +archive/ +*.md +www/*.bak +rust/target/ +**/.DS_Store +**/*.log diff --git a/.gitignore b/.gitignore index e705b4c..ed84900 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,6 @@ conf/tls/**/*.key conf/tls/**/*.cer conf/tls/**/*.crt conf/tls/**/*.pem + +# 种子数据含 API Key 与上游真 Key,只进镜像不入库 +deploy/ diff --git a/Dockerfile b/Dockerfile index 0be352c..6e387ce 100644 --- a/Dockerfile +++ b/Dockerfile @@ -75,6 +75,13 @@ COPY --from=builder /src/nginx-${NGINX_VERSION}/objs/nginx /usr/local/nginx/sbin COPY --from=builder /src/nginx-${NGINX_VERSION}/conf/mime.types /usr/local/nginx/conf/mime.types COPY --from=builder /build/rust/target/release/libipass_gateway.so /usr/local/nginx/modules/ +# 配置 / 证书(正式证书随镜像分发;勿把镜像推到公共仓库)/ 管理台静态页 / 种子数据 +# conf/nginx.conf 里的 include tls/*.conf 不递归,子目录内的供应商 .conf 不会被误加载 +COPY conf/nginx.conf /usr/local/nginx/conf/nginx.conf +COPY conf/tls/ /usr/local/nginx/conf/tls/ +COPY www/ /usr/local/nginx/www/ +COPY deploy/data-seed/ /usr/local/nginx/data/ + # 与旧版保持一致的工作目录约定,便于沿用现成的挂载与运维习惯 RUN mkdir -p /usr/local/nginx/conf /usr/local/nginx/www /usr/local/nginx/data /usr/local/nginx/logs \ && ln -sf /dev/stdout /usr/local/nginx/logs/access.log \