Add Docker detection and update repo references

Added DOCKER_SUPPORT.md with guidance for Docker users. Updated install-improved.sh to detect running RustDesk Docker containers and warn users, providing Docker management instructions and an option to continue. Changed all documentation and scripts to reference the new repository name 'Rustdesk-FreeConsole' instead of 'BetterDesk-Console'.
2026-09-10 09:35:39 +00:00 · 2026-01-12 03:55:23 +01:00
parent 899d28410b
commit ffeb8fc6fe
6 changed files with 148 additions and 20 deletions
@@ -0,0 +1,96 @@
+# 🐳 Docker Support Information
+
+## Issue: Installation Script Not Detecting Docker RustDesk
+
+If you're running RustDesk in Docker containers, the `install-improved.sh` script will now **detect** your Docker installation and inform you.
+
+### What Changed?
+
+**Before:** The script searched only for native file system installations and didn't recognize Docker containers.
+
+**Now:** The script:
+- ✅ Detects running Docker containers (hbbs/hbbr)
+- ⚠️ Warns you that it's designed for native installations
+- 📌 Provides Docker management commands
+- ❓ Asks if you want to continue anyway
+
+### If You're Using Docker
+
+The enhanced installer is primarily designed for **native RustDesk installations**. If you're running RustDesk in Docker, consider these options:
+
+#### Option 1: Continue with Native Installation (Not Recommended)
+
+You can choose to install BetterDesk Console alongside your Docker installation, but this may cause conflicts:
+- Port conflicts (21115, 21116, 21117, 21114)
+- Database access issues
+- Service management complexity
+
+#### Option 2: Docker-Native Management (Recommended)
+
+Manage your Docker RustDesk directly:
+
+```bash
+# Access container
+docker exec -it <container_name> /bin/sh
+
+# View logs
+docker logs <container_name>
+
+# Restart container
+docker restart <container_name>
+
+# Check status
+docker ps | grep -E "(hbbs|hbbr|rustdesk)"
+```
+
+#### Option 3: Install BetterDesk Console in Docker
+
+If you want to use BetterDesk Console with your Docker RustDesk, consider:
+
+1. **Mount the RustDesk database** from your Docker container to the host
+2. **Install BetterDesk Console** on the host
+3. **Configure it** to access the mounted database
+
+Example Docker compose setup:
+```yaml
+services:
+  hbbs:
+    image: rustdesk/rustdesk-server
+    volumes:
+      - ./db:/root/.rustdesk  # Mount database
+    ports:
+      - "21115:21115"
+      - "21116:21116/tcp"
+      - "21116:21116/udp"
+      - "21114:21114"  # API port
+```
+
+### Detecting Your Setup
+
+The script now runs these checks:
+
+```bash
+# Check for Docker containers
+docker ps --format "{{.Names}}" | grep -E "(hbbs|hbbr|rustdesk)"
+
+# Check for native installation
+ls -la /opt/rustdesk/hbbs 2>/dev/null
+```
+
+### Next Steps
+
+1. **Determine your setup:** Are you using Docker or native installation?
+2. **For Docker:** Use Docker management tools
+3. **For native:** Run `sudo ./install-improved.sh`
+4. **For hybrid:** Consider the implications carefully
+
+## Support
+
+If you need help deciding the best approach for your setup:
+- Open an issue: https://github.com/UNITRONIX/Rustdesk-FreeConsole/issues
+- Provide details about your current setup (Docker compose file, container names, etc.)
+
+---
+
+**Updated:** January 2026  
+**Version:** v1.3.1+
@@ -200,8 +200,8 @@ Enhanced installer with Docker support and custom path detection:

 ```bash
 # Clone the repository
-git clone https://github.com/UNITRONIX/BetterDesk-Console.git
-cd BetterDesk-Console
+git clone https://github.com/UNITRONIX/Rustdesk-FreeConsole.git
+cd Rustdesk-FreeConsole

 # Make the installer executable
 chmod +x install-improved.sh
@@ -222,8 +222,8 @@ Enhanced installer with automatic path detection:

 ```powershell
 # Clone the repository
-git clone https://github.com/UNITRONIX/BetterDesk-Console.git
-cd BetterDesk-Console
+git clone https://github.com/UNITRONIX/Rustdesk-FreeConsole.git
+cd Rustdesk-FreeConsole

 # Run as Administrator
 .\install-improved.ps1
@@ -89,7 +89,7 @@ curl http://localhost:21120/api/health

 **Automatic upgrade:**
 ```bash
-cd BetterDesk-Console
+cd Rustdesk-FreeConsole
 git pull
 sudo ./install-improved.sh
 ```
@@ -219,15 +219,15 @@ This release eliminates network exposure of the HTTP API.

 **Linux:**
 ```bash
-git clone https://github.com/UNITRONIX/BetterDesk-Console.git
-cd BetterDesk-Console
+git clone https://github.com/UNITRONIX/Rustdesk-FreeConsole.git
+cd Rustdesk-FreeConsole
 sudo ./install-improved.sh
 ```

 **Windows:**
 ```powershell
-git clone https://github.com/UNITRONIX/BetterDesk-Console.git
-cd BetterDesk-Console
+git clone https://github.com/UNITRONIX/Rustdesk-FreeConsole.git
+cd Rustdesk-FreeConsole
 .\install-improved.ps1  # Run as Administrator
 ```

@@ -235,7 +235,7 @@ cd BetterDesk-Console

 Automatic:
 ```bash
-cd BetterDesk-Console
+cd Rustdesk-FreeConsole
 git pull
 sudo ./install-improved.sh
 ```
@@ -319,8 +319,8 @@ sudo ./install-improved.sh

 ## 📞 Kontakt

-**Issues:** https://github.com/UNITRONIX/BetterDesk-Console/issues  
-**Discussions:** https://github.com/UNITRONIX/BetterDesk-Console/discussions
+**Issues:** https://github.com/UNITRONIX/Rustdesk-FreeConsole/issues  
+**Discussions:** https://github.com/UNITRONIX/Rustdesk-FreeConsole/discussions

 ---

@@ -51,8 +51,8 @@
 ### For Linux (Ubuntu 20.04+, Debian 11+)

 ```bash
-git clone https://github.com/UNITRONIX/BetterDesk-Console.git
-cd BetterDesk-Console
+git clone https://github.com/UNITRONIX/Rustdesk-FreeConsole.git
+cd Rustdesk-FreeConsole
 chmod +x install-improved.sh
 sudo ./install-improved.sh
 ```
@@ -64,8 +64,8 @@ sudo ./install-improved.sh
 ### For Windows (Windows 10+, Server 2016+)

 ```powershell
-git clone https://github.com/UNITRONIX/BetterDesk-Console.git
-cd BetterDesk-Console
+git clone https://github.com/UNITRONIX/Rustdesk-FreeConsole.git
+cd Rustdesk-FreeConsole
 # Run as Administrator
 .\install-improved.ps1
 ```
@@ -104,7 +104,7 @@ RustDesk client ports remain publicly accessible (required):
 ### Automatic Upgrade (Recommended)

 ```bash
-cd BetterDesk-Console
+cd Rustdesk-FreeConsole
 git pull
 sudo ./install-improved.sh
 ```
@@ -278,7 +278,7 @@ See [CHANGELOG.md](CHANGELOG.md) for complete version history.
 Contributions welcome! See [CONTRIBUTING.md](CONTRIBUTING.md) for guidelines.

 **Report issues:**
- GitHub Issues: https://github.com/UNITRONIX/BetterDesk-Console/issues
+- GitHub Issues: https://github.com/UNITRONIX/Rustdesk-FreeConsole/issues

 ---

@@ -298,7 +298,7 @@ MIT License - See [LICENSE](LICENSE) file for details.

 ## 🔗 Links

- **Repository:** https://github.com/UNITRONIX/BetterDesk-Console
+- **Repository:** https://github.com/UNITRONIX/Rustdesk-FreeConsole
 - **Documentation:** [README.md](README.md)
 - **Security:** [PORT_SECURITY.md](PORT_SECURITY.md)
 - **RustDesk:** https://rustdesk.com/
@@ -122,6 +122,38 @@ check_dependencies() {
 detect_rustdesk_directory() {
    print_header "Detecting RustDesk Installation"
    
+    # Check for Docker containers first
+    if command -v docker &> /dev/null; then
+        local docker_containers=$(docker ps --filter "ancestor=rustdesk/rustdesk-server" --format "{{.Names}}" 2>/dev/null)
+        if [ -z "$docker_containers" ]; then
+            # Also check for containers with hbbs/hbbr in the name
+            docker_containers=$(docker ps --format "{{.Names}}" | grep -E "(hbbs|hbbr|rustdesk)" 2>/dev/null || true)
+        fi
+        
+        if [ -n "$docker_containers" ]; then
+            print_warning "Docker RustDesk installation detected!"
+            echo ""
+            echo "Found running RustDesk containers:"
+            echo "$docker_containers" | while read -r container; do
+                echo "  - $container"
+            done
+            echo ""
+            print_error "This installation script is designed for native RustDesk installations."
+            print_info "For Docker installations, please use Docker-specific management tools."
+            echo ""
+            echo "To manage your Docker RustDesk:"
+            echo "  • Access container: docker exec -it <container_name> /bin/sh"
+            echo "  • View logs: docker logs <container_name>"
+            echo "  • Restart: docker restart <container_name>"
+            echo ""
+            read -p "Do you want to continue with native installation anyway? [y/N]: " continue_anyway
+            if [[ ! "$continue_anyway" =~ ^[Yy]$ ]]; then
+                print_info "Installation cancelled"
+                exit 0
+            fi
+        fi
+    fi
+    
    # Common installation directories
    local common_dirs=(
        "/opt/rustdesk"
@@ -151,7 +183,7 @@ detect_rustdesk_directory() {
    fi
    
    if [ ${#found_dirs[@]} -eq 0 ]; then
-        print_warning "No existing RustDesk installation found"
+        print_warning "No existing native RustDesk installation found"
        echo ""
        echo "Options:"
        echo "  1) Install to default location: /opt/rustdesk"