From 73ada50e23abff872c2c00f7d6aab50790d1963b Mon Sep 17 00:00:00 2001
From: fanxb <fanxb.tl@gmail.com>
Date: Sun, 17 Nov 2019 17:40:56 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9D=93=20Chore:=20[docker]:=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9docker=E9=83=A8=E7=BD=B2=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bookMarkDocker/docker-compose.yml | 3 +++
 bookMarkDocker/nginx/nginx.conf   | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/bookMarkDocker/docker-compose.yml b/bookMarkDocker/docker-compose.yml
index 07c2c10..99894ee 100644
--- a/bookMarkDocker/docker-compose.yml
+++ b/bookMarkDocker/docker-compose.yml
@@ -56,6 +56,7 @@ services:
       - ../front/build:/opt/dist
       - ./nginx/nginx.conf:/etc/nginx/nginx.conf
       - ./nginx/log:/var/log/nginx
+      - ${BOOKMARK_FILE_SAVE_PATH}/public:/opt/files/public
     ports: 
       - 8083:8080
   bookmark-service:
@@ -88,6 +89,8 @@ services:
         -Dspring.datasource.druid.url=jdbc:mysql://bookmark-mysql:3306/bookmark?useUnicode=true\&characterEncoding=utf-8\&useSSL=false\&useJDBCCompliantTimezoneShift=true\&useLegacyDatetimeCode=false\&serverTimezone=UTC \
         -Dspring.redis.host=bookmark-redis \
         -Des.host=bookmark-es \
+        -DserviceAddress=${BOOKMARK_HOST} \
+        -DfileSavePath=${BOOKMARK_FILE_SAVE_PATH} \
         service.jar
 networks: 
   bookmark:
diff --git a/bookMarkDocker/nginx/nginx.conf b/bookMarkDocker/nginx/nginx.conf
index f0cd3e9..76696fa 100644
--- a/bookMarkDocker/nginx/nginx.conf
+++ b/bookMarkDocker/nginx/nginx.conf
@@ -41,5 +41,9 @@ http {
             index index.html;
             try_files $uri $uri/ /index.html;
         }
+
+        location /files/public{
+            root /opt/files/public;
+        }
     }
 }