From 180a39f991dda91cdb440aa6f5331cdcbde87c90 Mon Sep 17 00:00:00 2001
From: Boris <564773807@qq.com>
Date: Sun, 23 Jan 2022 23:03:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=94=AF=E6=8C=81=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E7=AB=AF=E5=8F=A3=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=E7=AD=89=E9=AB=98=E9=98=B6=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                |  4 ++--
 docker-compose.yaml | 31 ++++++++++++++++---------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/.env b/.env
index dd91a9a..49852b6 100644
--- a/.env
+++ b/.env
@@ -9,9 +9,9 @@ REDIS_PORT=6379
 # 后端worker数
 BACKEND_WORKER=1
 # 前端镜像
-FRONT_IMAGE=registry.cn-hangzhou.aliyuncs.com/feapderd/feapder_front:1.5
+FRONT_IMAGE=registry.cn-hangzhou.aliyuncs.com/feapderd/feapder_front:1.6
 # 后端镜像
-BACKEND_IMAGE=registry.cn-hangzhou.aliyuncs.com/feapderd/feapder_backend:2.2
+BACKEND_IMAGE=registry.cn-hangzhou.aliyuncs.com/feapderd/feapder_backend:2.3
 # 爬虫镜像
 SPIDER_IMAGE=registry.cn-hangzhou.aliyuncs.com/feapderd/feapder:1.8
 # 监控系统端口配置
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 3b1a01f..74b5cd0 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -49,6 +49,7 @@ services:
       - influxdb
 
   feapder:
+    container_name: feapder_worker
     image: ${SPIDER_IMAGE}
 
   mysql:
@@ -76,21 +77,21 @@ services:
     volumes:
       - "~/data/feapder/feapder_backend_redis:/data" # redis 挂载， 本地目录:容器路径
 
-  # 监控
-  grafana:
-    user: root
-    restart: always
-    image: grafana/grafana
-    container_name: feapder_grafana
-    volumes:
-      - ~/data/feapder/grafana:/var/lib/grafana
-    environment:
-      - GF_SECURITY_ADMIN_USER=admin
-      - GF_SECURITY_ADMIN_PASSWORD=admin
-    ports:
-      - ${GRAFANA_PORT}:3000
-    depends_on:
-      - influxdb
+#  # 监控
+#  grafana:
+#    user: root
+#    restart: always
+#    image: grafana/grafana
+#    container_name: feapder_grafana
+#    volumes:
+#      - ~/data/feapder/grafana:/var/lib/grafana
+#    environment:
+#      - GF_SECURITY_ADMIN_USER=admin
+#      - GF_SECURITY_ADMIN_PASSWORD=admin
+#    ports:
+#      - ${GRAFANA_PORT}:3000
+#    depends_on:
+#      - influxdb
 
   influxdb:
     restart: always