From 9d530bd472e43e1f78d1c26fdd83536358e4d66d Mon Sep 17 00:00:00 2001 From: vbevdev Date: Tue, 7 Jul 2026 00:21:00 +0300 Subject: [PATCH 1/7] rustdesk --- docker-compose.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 0d752a7..0046feb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,6 +7,11 @@ services: ports: - '80:80' - '443:443' + - '21116:21116/tcp' + - '21116:21116/udp' + - '21117:21117/tcp' + - '21118:21118/tcp' + - '21119:21119/tcp' volumes: - ./data/nginx-proxy-manager/data:/data - ./data/nginx-proxy-manager/letsencrypt:/etc/letsencrypt @@ -106,6 +111,24 @@ services: retries: 3 start_period: 10s + sup-hbbs: + image: rustdesk/rustdesk-server:latest + container_name: rustdesk-hbbs + command: hbbs -r ${RUSTDESK_DOMAIN}:21117 -k _ + restart: unless-stopped + volumes: + - ./data/rustdesk:/root + depends_on: + - sup-hbbr + + sup-hbbr: + image: rustdesk/rustdesk-server:latest + container_name: rustdesk-hbbr + command: hbbr + restart: unless-stopped + volumes: + - ./data/rustdesk:/root + networks: default: name: vbevdev -- 2.52.0 From d081429318e3512f9da9c7586d43833573c353a9 Mon Sep 17 00:00:00 2001 From: vbevdev Date: Tue, 7 Jul 2026 00:29:49 +0300 Subject: [PATCH 2/7] deployment adjusted for rustdesk --- .env.example | 1 + .gitea/workflows/deploy.yaml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.env.example b/.env.example index 69293b9..2932b57 100644 --- a/.env.example +++ b/.env.example @@ -1,3 +1,4 @@ BESZEL_HUB_URL=http://mon.localhost NEXTCLOUD_DOMAIN=cld.localhost GITEA_URL=http://git:3000 +RUSTDESK_DOMAIN=sup.local diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 0a7d0f3..ecf7ae5 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -80,6 +80,7 @@ jobs: GITEA_URL: ${{ vars.GIT_URL }} VAULTWARDEN_ADMIN_TOKEN: ${{ secrets.VAULTWARDEN_ADMIN_TOKEN }} NEXTCLOUD_DOMAIN: ${{ vars.NEXTCLOUD_DOMAIN }} + RUSTDESK_DOMAIN: ${{ vars.RUSTDESK_DOMAIN }} run: | sshpass -e ssh -p 22 "$SSH_USERNAME@$SSH_HOST" bash -s << EOT set -e @@ -89,6 +90,7 @@ jobs: BESZEL_HUB_URL=$BESZEL_HUB_URL NEXTCLOUD_DOMAIN=$NEXTCLOUD_DOMAIN GITEA_URL=$GITEA_URL + RUSTDESK_DOMAIN=$RUSTDESK_DOMAIN EOF_ENV mkdir -p secrets -- 2.52.0 From cefcb00624ca7a834afc649766b601827d7dff17 Mon Sep 17 00:00:00 2001 From: vbevdev Date: Tue, 7 Jul 2026 00:33:00 +0300 Subject: [PATCH 3/7] fixed rustdesk container names --- docker-compose.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 0046feb..0412b54 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -113,7 +113,6 @@ services: sup-hbbs: image: rustdesk/rustdesk-server:latest - container_name: rustdesk-hbbs command: hbbs -r ${RUSTDESK_DOMAIN}:21117 -k _ restart: unless-stopped volumes: @@ -123,7 +122,6 @@ services: sup-hbbr: image: rustdesk/rustdesk-server:latest - container_name: rustdesk-hbbr command: hbbr restart: unless-stopped volumes: -- 2.52.0 From d52956ec70da2948856eef2996dff98178249e84 Mon Sep 17 00:00:00 2001 From: vbevdev Date: Sun, 26 Jul 2026 19:17:45 +0300 Subject: [PATCH 4/7] rustdesk ports directly on its containers --- docker-compose.yml | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 0412b54..606811e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,11 +7,11 @@ services: ports: - '80:80' - '443:443' - - '21116:21116/tcp' - - '21116:21116/udp' - - '21117:21117/tcp' - - '21118:21118/tcp' - - '21119:21119/tcp' + # - '21116:21116/tcp' + # - '21116:21116/udp' + # - '21117:21117/tcp' + # - '21118:21118/tcp' + # - '21119:21119/tcp' volumes: - ./data/nginx-proxy-manager/data:/data - ./data/nginx-proxy-manager/letsencrypt:/etc/letsencrypt @@ -113,8 +113,14 @@ services: sup-hbbs: image: rustdesk/rustdesk-server:latest - command: hbbs -r ${RUSTDESK_DOMAIN}:21117 -k _ + # command: hbbs -r ${RUSTDESK_DOMAIN}:21117 -k _ + command: hbbs -r ${RUSTDESK_DOMAIN}:21117 -k "" restart: unless-stopped + ports: + - '21115:21115/tcp' + - '21116:21116/tcp' + - '21116:21116/udp' # Прямой UDP-порт без посредничества NPM + - '21118:21118/tcp' volumes: - ./data/rustdesk:/root depends_on: @@ -124,6 +130,9 @@ services: image: rustdesk/rustdesk-server:latest command: hbbr restart: unless-stopped + ports: + - '21117:21117/tcp' # Прямой TCP-порт для реле + - '21119:21119/tcp' volumes: - ./data/rustdesk:/root -- 2.52.0 From 2272dd935c161dd7697245e004130daa9195c183 Mon Sep 17 00:00:00 2001 From: vbevdev Date: Sun, 26 Jul 2026 21:24:22 +0300 Subject: [PATCH 5/7] return rustdesk key check --- docker-compose.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 606811e..e406cc7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -113,8 +113,7 @@ services: sup-hbbs: image: rustdesk/rustdesk-server:latest - # command: hbbs -r ${RUSTDESK_DOMAIN}:21117 -k _ - command: hbbs -r ${RUSTDESK_DOMAIN}:21117 -k "" + command: hbbs -r ${RUSTDESK_DOMAIN}:21117 -k _ restart: unless-stopped ports: - '21115:21115/tcp' -- 2.52.0 From 169ff8917abf19428831176e6e633095d97f5c2f Mon Sep 17 00:00:00 2001 From: vbevdev Date: Mon, 27 Jul 2026 00:29:13 +0300 Subject: [PATCH 6/7] rustdesk ports moved to prx --- docker-compose.yml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index e406cc7..e7e9f99 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,6 +7,9 @@ services: ports: - '80:80' - '443:443' + - '21116:21116/tcp' + - '21116:21116/udp' + - '21117:21117/tcp' # - '21116:21116/tcp' # - '21116:21116/udp' # - '21117:21117/tcp' @@ -115,11 +118,11 @@ services: image: rustdesk/rustdesk-server:latest command: hbbs -r ${RUSTDESK_DOMAIN}:21117 -k _ restart: unless-stopped - ports: - - '21115:21115/tcp' - - '21116:21116/tcp' - - '21116:21116/udp' # Прямой UDP-порт без посредничества NPM - - '21118:21118/tcp' + # ports: + # - '21115:21115/tcp' + # - '21116:21116/tcp' + # - '21116:21116/udp' # Прямой UDP-порт без посредничества NPM + # - '21118:21118/tcp' volumes: - ./data/rustdesk:/root depends_on: @@ -129,9 +132,9 @@ services: image: rustdesk/rustdesk-server:latest command: hbbr restart: unless-stopped - ports: - - '21117:21117/tcp' # Прямой TCP-порт для реле - - '21119:21119/tcp' + # ports: + # - '21117:21117/tcp' # Прямой TCP-порт для реле + # - '21119:21119/tcp' volumes: - ./data/rustdesk:/root -- 2.52.0 From b0495763c3e19d3e6c7cd3d8fdae3832db5ba449 Mon Sep 17 00:00:00 2001 From: vbevdev Date: Mon, 27 Jul 2026 00:42:09 +0300 Subject: [PATCH 7/7] rustdesk final docker-compose --- docker-compose.yml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index e7e9f99..79c8915 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,11 +10,6 @@ services: - '21116:21116/tcp' - '21116:21116/udp' - '21117:21117/tcp' - # - '21116:21116/tcp' - # - '21116:21116/udp' - # - '21117:21117/tcp' - # - '21118:21118/tcp' - # - '21119:21119/tcp' volumes: - ./data/nginx-proxy-manager/data:/data - ./data/nginx-proxy-manager/letsencrypt:/etc/letsencrypt @@ -118,11 +113,6 @@ services: image: rustdesk/rustdesk-server:latest command: hbbs -r ${RUSTDESK_DOMAIN}:21117 -k _ restart: unless-stopped - # ports: - # - '21115:21115/tcp' - # - '21116:21116/tcp' - # - '21116:21116/udp' # Прямой UDP-порт без посредничества NPM - # - '21118:21118/tcp' volumes: - ./data/rustdesk:/root depends_on: @@ -132,9 +122,6 @@ services: image: rustdesk/rustdesk-server:latest command: hbbr restart: unless-stopped - # ports: - # - '21117:21117/tcp' # Прямой TCP-порт для реле - # - '21119:21119/tcp' volumes: - ./data/rustdesk:/root -- 2.52.0