From 59e9439bcc680acf22cc7b13b101c8a68c9710de Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 19 八月 2024 17:20:58 +0800
Subject: [PATCH] 1
---
/dev/null | 15 ---------------
docker-compose/nginx/conf/nginx.conf | 3 ++-
docker-compose/docker-compose.yml | 4 ++--
3 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 4d3e85e..72b60ba 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -94,10 +94,10 @@
ports:
- 8090:80
volumes:
- - ./nginx/html/dist:/home/se/projects/se-ui
- - ./nginx/conf/nginx.conf:/etc/nginx/nginx.conf
- ./nginx/logs:/var/log/nginx
- ./nginx/conf.d:/etc/nginx/conf.d
+ - ./nginx/html:/usr/share/nginx/html
+ - ./nginx/conf/nginx.conf:/etc/nginx/nginx.conf
depends_on:
- se-gateway
links:
diff --git a/docker-compose/nginx/conf/nginx.conf b/docker-compose/nginx/conf/nginx.conf
index 2e46854..ba639ab 100644
--- a/docker-compose/nginx/conf/nginx.conf
+++ b/docker-compose/nginx/conf/nginx.conf
@@ -15,7 +15,7 @@
server_name localhost;
location / {
- root /home/se/projects/se-ui;
+ root /usr/share/nginx/html;
try_files $uri $uri/ /index.html;
index index.html index.htm;
}
@@ -25,6 +25,7 @@
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header REMOTE-HOST $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+
proxy_pass http://se-gateway:8080/;
}
diff --git a/docker-compose/nginx/dockerfile b/docker-compose/nginx/dockerfile
deleted file mode 100644
index 1e730cc..0000000
--- a/docker-compose/nginx/dockerfile
+++ /dev/null
@@ -1,15 +0,0 @@
-# 鍩虹闀滃儚
-FROM nginx:latest
-# author
-MAINTAINER se
-
-# 鎸傝浇鐩綍
-VOLUME /home/se/projects/se-ui
-# 鍒涘缓鐩綍
-RUN mkdir -p /home/se/projects/se-ui
-# 鎸囧畾璺緞
-WORKDIR /home/se/projects/se-ui
-# 澶嶅埗conf鏂囦欢鍒拌矾寰�
-COPY ./conf/nginx.conf /etc/nginx/nginx.conf
-# 澶嶅埗html鏂囦欢鍒拌矾寰�
-COPY ./html/dist /home/se/projects/se-ui
--
Gitblit v1.9.3