From dffb2563be0142eabd0e2ad56eec8c28e024b3ab Mon Sep 17 00:00:00 2001 From: ZF sun <34314687@qq.com> Date: Wed, 24 Dec 2025 14:10:34 +0800 Subject: [PATCH] =?UTF-8?q?chore(docker):=20=E7=AE=80=E5=8C=96nginx=20dock?= =?UTF-8?q?er=E7=9A=84=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml | 8 +++++--- docker/nginx/Dockerfile | 29 ----------------------------- 2 files changed, 5 insertions(+), 32 deletions(-) delete mode 100644 docker/nginx/Dockerfile diff --git a/docker-compose.yml b/docker-compose.yml index e86b54f85..8ae8edd1b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -45,9 +45,7 @@ services: - "com.docker.compose.project.working_dir=${PROJECT_NAME}_${APP_ENV}" nginx: - build: - context: ./docker/nginx - dockerfile: Dockerfile + image: nginx:alpine container_name: ${PROJECT_NAME}_${APP_ENV}_nginx restart: always ports: @@ -58,6 +56,10 @@ services: - ./src:/var/www/html:rw # 更新下载源列表以加速apt-get - ./docker/debian/sources.list:/etc/apt/sources.list:ro + # 挂载 nginx 配置文件 + - ./docker/nginx/conf.c:/etc/nginx/conf.c:ro + - ./docker/nginx/default.conf:/etc/nginx/conf.d/default.conf:ro + - ./docker/nginx/sites-enabled:/etc/nginx/sites-enabled:ro # 创建临时目录 - /var/www/server/nginx/proxy_temp_dir - /var/www/server/nginx/proxy_cache_dir diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile deleted file mode 100644 index 63fbf1aa4..000000000 --- a/docker/nginx/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -FROM nginx:alpine - -# 删除默认配置 -RUN rm /etc/nginx/conf.d/default.conf - -# -# - ./.docker/nginx/conf.c:/etc/nginx/conf.c:ro -# - ./.docker/nginx/default.conf:/etc/nginx/conf.d/default.conf:ro -# - ./.docker/nginx/sites-enabled:/etc/nginx/sites-enabled:ro -# 将本地 nginx 配置复制到镜像中并设置为只读 -COPY ./conf.c/ /etc/nginx/conf.c/ -COPY ./default.conf /etc/nginx/conf.d/default.conf -COPY ./sites-enabled/ /etc/nginx/sites-enabled/ - -# 设置只读权限(文件 0444,目录及其内容 0555) -RUN chmod 0444 /etc/nginx/conf.c \ - && chmod 0444 /etc/nginx/conf.d/default.conf \ - && chmod -R 0555 /etc/nginx/sites-enabled - -# 设置工作目录 -WORKDIR /var/www/html - -# 创建日志目录 -RUN mkdir -p /var/log/nginx - -# 暴露端口 -EXPOSE 80 443 - -CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file