From 84a34185219cbf01f5b137e0b297c1f1e0ccfbed Mon Sep 17 00:00:00 2001
From: zhou-hao <admin@hsweb.me>
Date: Mon, 2 Aug 2021 11:09:45 +0800
Subject: [PATCH] 1.10.0

---
 docker/run-all/docker-compose-embedded.yml | 51 ----------------------
 docker/run-all/docker-compose.yml          |  6 +--
 2 files changed, 3 insertions(+), 54 deletions(-)
 delete mode 100644 docker/run-all/docker-compose-embedded.yml

diff --git a/docker/run-all/docker-compose-embedded.yml b/docker/run-all/docker-compose-embedded.yml
deleted file mode 100644
index e07c4a85..00000000
--- a/docker/run-all/docker-compose-embedded.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-version: '2'
-services:
-  redis:
-    image: redis:5.0.4
-    container_name: jetlinks-ce-redis
-    #    ports:
-    #      - "6379:6379"
-    volumes:
-      - "redis-volume:/data"
-    command: redis-server --appendonly yes
-    environment:
-      - TZ=Asia/Shanghai
-  ui:
-    image: registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-ui-antd:1.4.0
-    container_name: jetlinks-ce-ui
-    ports:
-      - 9000:80
-    environment:
-      - "API_BASE_PATH=http://jetlinks:8848/" #API根路径
-    volumes:
-      - "jetlinks-upload-volume:/usr/share/nginx/html/upload"
-    links:
-      - jetlinks:jetlinks
-  jetlinks:
-    image: registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-standalone:1.4.0
-    container_name: jetlinks-ce
-    ports:
-      - 8848:8848 # API端口
-      - 1883:1883 # MQTT端口
-      - 8000:8000 # 预留
-      - 8001:8001 # 预留
-      - 8002:8002 # 预留
-      - 9000:9000 # elasticsearch
-      - 6379:6379 # redis
-    volumes:
-      - "jetlinks-upload-volume:/static/upload"  # 持久化上传的文件
-      - "jetlinks-data-volume:/data"
-    environment:
-     # - "JAVA_OPTS=-Xms4g -Xmx18g -XX:+UseG1GC"
-      - "spring.profiles.active=dev,embedded" #使用dev和embedded环境.
-      - "hsweb.file.upload.static-location=http://127.0.0.1:8848/upload"  #上传的静态文件访问根地址,为ui的地址.
-      - "logging.level.io.r2dbc=warn"
-      - "spring.redis.host=redis"
-      - "logging.level.org.springframework.data=warn"
-      - "logging.level.org.springframework=warn"
-      - "logging.level.org.jetlinks=warn"
-      - "logging.level.org.hswebframework=warn"
-      - "logging.level.org.springframework.data.r2dbc.connectionfactory=warn"
-volumes:
-  jetlinks-upload-volume:
-  jetlinks-data-volume:
\ No newline at end of file
diff --git a/docker/run-all/docker-compose.yml b/docker/run-all/docker-compose.yml
index 154900a8..7b533a46 100644
--- a/docker/run-all/docker-compose.yml
+++ b/docker/run-all/docker-compose.yml
@@ -62,9 +62,9 @@ services:
     image: registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-standalone:1.10.0
     container_name: jetlinks-ce
     ports:
-      - 8848:8848 # API端口
-      - 1883-1890:1883-1890 # 预留
-      - 8000-8010:8000-8010 # 预留
+      - "8848:8848" # API端口
+      - "1883-1890:1883-1890" # 预留
+      - "8000-8010:8000-8010" # 预留
     volumes:
       - "jetlinks-volume:/application/static/upload"  # 持久化上传的文件
       - "jetlinks-protocol-volume:/application/data/protocols"