From 8578e6146fb13975eac2cbf3e91e865f2b2a5b3f Mon Sep 17 00:00:00 2001 From: bunny <1319900154@qq.com> Date: Sat, 24 May 2025 15:09:56 +0800 Subject: [PATCH] =?UTF-8?q?CI=20=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 2 -- docker/nginx.conf | 14 +++++++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b782046..55afb95 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,8 +24,6 @@ build-job: - npm i -g pnpm && pnpm i && pnpm build # 打印编译完成信息 - echo "Compile complete." - # 创建文件夹 - - mkdir docker/dist # 从Docker Hub拉取OpenJDK基础镜像 - docker pull nginx:1.27.3 # 打印拉取完成信息 diff --git a/docker/nginx.conf b/docker/nginx.conf index d23fe4e..ad04d8c 100644 --- a/docker/nginx.conf +++ b/docker/nginx.conf @@ -16,13 +16,13 @@ server { } # 后端跨域请求 - location ~/api/ { - proxy_pass http://172.17.0.1:8000; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - } + # location ~/api/ { + # proxy_pass http://172.17.0.1:8000; + # proxy_set_header Host $http_host; + # proxy_set_header X-Real-IP $remote_addr; + # proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + # proxy_set_header X-Forwarded-Proto $scheme; + # } error_page 404 404.html;