lejianwen 1 год назад
Родитель
Сommit
c72e0dc3e1
2 измененных файлов с 18 добавлено и 23 удалено
  1. 2 0
      README.md
  2. 16 23
      docker-compose.yml

+ 2 - 0
README.md

@@ -7,6 +7,7 @@
7 7
 
8 8
 - 解决当客户端登录了`Api`账号时链接超时的问题
9 9
 - s6镜像添加了`Api`支持,`Api`开源地址 https://github.com/lejianwen/rustdesk-api
10
+- 是否必须登录才能链接, `MUST_LOGIN` 默认为 `N`,设置为 `Y` 则必须登录才能链接
10 11
 
11 12
 ## docker镜像地址
12 13
 
@@ -30,6 +31,7 @@
30 31
      environment:
31 32
        - RELAY=<relay_server[:port]>
32 33
        - ENCRYPTED_ONLY=1
34
+       - MUST_LOGIN=N
33 35
        - TZ=Asia/Shanghai
34 36
        - RUSTDESK_API_RUSTDESK_ID_SERVER=<id_server[:21116]>
35 37
        - RUSTDESK_API_RUSTDESK_RELAY_SERVER=<relay_server[:21117]>

+ 16 - 23
docker-compose.yml

@@ -1,36 +1,29 @@
1
-version: '3'
2
-
3 1
 networks:
4 2
   rustdesk-net:
5 3
     external: false
6
-
7 4
 services:
8
-  hbbs:
9
-    container_name: hbbs
5
+  rustdesk:
10 6
     ports:
7
+      - 21114:21114
11 8
       - 21115:21115
12 9
       - 21116:21116
13 10
       - 21116:21116/udp
14
-      - 21118:21118
15
-    image: rustdesk/rustdesk-server:latest
16
-    command: hbbs -r rustdesk.example.com:21117
17
-    volumes:
18
-      - ./data:/root
19
-    networks:
20
-      - rustdesk-net
21
-    depends_on:
22
-      - hbbr
23
-    restart: unless-stopped
24
-
25
-  hbbr:
26
-    container_name: hbbr
27
-    ports:
28 11
       - 21117:21117
12
+      - 21118:21118
29 13
       - 21119:21119
30
-    image: rustdesk/rustdesk-server:latest
31
-    command: hbbr
14
+    image: lejianwen/rustdesk-server-s6:latest
15
+    environment:
16
+      - RELAY=<relay_server[:port]>
17
+      - ENCRYPTED_ONLY=1
18
+      - MUST_LOGIN=N
19
+      - TZ=Asia/Shanghai
20
+      - RUSTDESK_API_RUSTDESK_ID_SERVER=<id_server[:21116]>
21
+      - RUSTDESK_API_RUSTDESK_RELAY_SERVER=<relay_server[:21117]>
22
+      - RUSTDESK_API_RUSTDESK_API_SERVER=http://<api_server[:21114]>
32 23
     volumes:
33
-      - ./data:/root
24
+      - /data/rustdesk/server:/data
25
+      - /data/rustdesk/api:/app/data #将数据库挂载
26
+      - /data/rustdesk/server:/app/conf/data #挂载key文件到api容器,可以不用使用 RUSTDESK_API_RUSTDESK_KEY
34 27
     networks:
35 28
       - rustdesk-net
36
-    restart: unless-stopped
29
+    restart: unless-stopped