From 17b2d05b1e1635f868d860f431da34885bbd0ca0 Mon Sep 17 00:00:00 2001
From: divenswu <divenswu@163.com>
Date: Wed, 30 Nov 2022 16:57:59 +0800
Subject: [PATCH] =?UTF-8?q?update:=E4=BF=AE=E6=94=B9=E5=90=AF=E5=8A=A8?=
 =?UTF-8?q?=E5=92=8C=E7=BC=96=E8=AF=91=E7=9A=84=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/docker-compose-opensearch.yml | 19 ++++++++++++++++---
 scripts/docker_build.sh               |  2 +-
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/scripts/docker-compose-opensearch.yml b/scripts/docker-compose-opensearch.yml
index 0ac5c4b..88b5209 100644
--- a/scripts/docker-compose-opensearch.yml
+++ b/scripts/docker-compose-opensearch.yml
@@ -11,6 +11,9 @@ services:
       TZ: Asia/Shanghai
     expose:
       - "3306"
+## 若需要远程访问mysql，请打开下面的配置 ##
+#    ports:
+#      - "3306:3306"
     command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
     volumes:
       - ${FACESEARCH_VOLUME_DIRECTORY:-.}/volumes-face-search/mysql:/var/lib/mysql
@@ -24,6 +27,10 @@ services:
     expose:
       - "9200"
       - "9600"
+## 若需要远程访问opensearch，请打开下面的配置 ##
+#    ports:
+#      - "9200:9200"
+#      - "9600:9600"
     volumes:
       - ${FACESEARCH_VOLUME_DIRECTORY:-.}/volumes-face-search/opensearch/data:/usr/share/opensearch/data
     restart: always
@@ -34,14 +41,14 @@ services:
     environment:
       OPENSEARCH_HOSTS: '["https://visual-opensearch:9200"]'
     ports:
-    - "5601:5601"
+      - "5601:5601"
     depends_on:
       - "visual-opensearch"
     restart: always
 
   visual-facesearch:
     container_name: face-search-server-standalone
-    image: divenswu/face-search:2.0.0
+    image: divenswu/face-search:2.0.1
     environment:
       SPRING_DATASOURCE_URL: 'jdbc:mysql://visual-mysql:3306/visual_face_search?useUnicode=true&characterEncoding=utf8'
       SPRING_DATASOURCE_USERNAME: root
@@ -49,11 +56,17 @@ services:
       VISUAL_ENGINE_OPENSEARCH_HOST: visual-opensearch
       VISUAL_ENGINE_OPENSEARCH_PORT: 9200
       VISUAL_SWAGGER_ENABLE: 'true'
-      JAVA_OPTS: '-XX:MaxDirectMemorySize=400M'
+      JAVA_OPTS: '-XX:MaxDirectMemorySize=400M -Xmx1536m -Xms1536m'     #线上环境自行修改#
     volumes:
       - ${FACESEARCH_VOLUME_DIRECTORY:-.}/volumes-face-search/search/logs:/app/face-search/logs
     ports:
       - "56789:8080"
+    deploy:
+      resources:
+        limits:
+          memory: 2G  #线上环境自行修改#
+        reservations:
+          memory: 1G  #线上环境自行修改#
     depends_on:
       - "visual-mysql"
       - "visual-opensearch"
diff --git a/scripts/docker_build.sh b/scripts/docker_build.sh
index 6bd8e49..068b12d 100644
--- a/scripts/docker_build.sh
+++ b/scripts/docker_build.sh
@@ -1,4 +1,4 @@
-version='2.0.0'
+version='2.0.1'
 SHELL_FOLDER=$(cd "$(dirname "$0")";pwd)
 cd ${SHELL_FOLDER}