From 36f168fa2d7ea93112075d06c207e253638f87c1 Mon Sep 17 00:00:00 2001
From: fanxb <fanxb.tl@gmail.com>
Date: Sat, 9 May 2020 14:46:24 +0800
Subject: [PATCH] =?UTF-8?q?deploy:=E5=8E=BB=E9=99=A4docker=E9=83=A8?=
 =?UTF-8?q?=E7=BD=B2es=EF=BC=8C=E6=9A=82=E6=97=B6=E4=B8=8D=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bookMarkDocker/docker-compose.yml | 34 +++++++++++++++----------------
 bookMarkDocker/init.sh            |  2 +-
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/bookMarkDocker/docker-compose.yml b/bookMarkDocker/docker-compose.yml
index dcd08b9..1e9da7d 100644
--- a/bookMarkDocker/docker-compose.yml
+++ b/bookMarkDocker/docker-compose.yml
@@ -27,22 +27,22 @@ services:
     # redis未设置密码，如端口暴露可能会被攻击
     ports:
       - 6380:6379
-  bookmark-es:
-    image: elasticsearch:7.2.0
-    container_name: bookmark-es
-    volumes:
-      - /etc/localtime:/etc/localtime
-      - ./timezone:/etc/timezone
-      - ./es/data:/usr/share/elasticsearch/data
-      - ./es/ik:/usr/share/elasticsearch/plugins/ik
-      - ./es/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml
-    environment:
-      - "ES_JAVA_OPTS=-Xms1500m -Xmx1500m"
-    ports:
-      - 9200:9200
-      - 9300:9300
-    networks:
-      - bookmark
+  # bookmark-es:
+  #   image: elasticsearch:7.2.0
+  #   container_name: bookmark-es
+  #   volumes:
+  #     - /etc/localtime:/etc/localtime
+  #     - ./timezone:/etc/timezone
+  #     - ./es/data:/usr/share/elasticsearch/data
+  #     - ./es/ik:/usr/share/elasticsearch/plugins/ik
+  #     - ./es/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml
+  #   environment:
+  #     - "ES_JAVA_OPTS=-Xms1500m -Xmx1500m"
+  #   ports:
+  #     - 9200:9200
+  #     - 9300:9300
+  #   networks:
+  #     - bookmark
   bookmark-front:
     image: nginx
     container_name: bookmark-front
@@ -83,7 +83,7 @@ services:
     depends_on:
       - bookmark-mysql
       - bookmark-redis
-      - bookmark-es
+      # - bookmark-es
     networks:
       - bookmark
     volumes:
diff --git a/bookMarkDocker/init.sh b/bookMarkDocker/init.sh
index b92cda8..40b8c3e 100755
--- a/bookMarkDocker/init.sh
+++ b/bookMarkDocker/init.sh
@@ -2,7 +2,7 @@
 base=$(cd "$(dirname "$0")";pwd)
 
 # 创建es存放数据文件夹并设置读写权限
-mkdir $base/es/data>/dev/null 2>&1
+# mkdir $base/es/data>/dev/null 2>&1
 
 chmod 777 $base/es/data