From bd8372b0747af0ba7caf7dc021e0321344ca57da Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Thu, 20 Apr 2023 09:25:32 -0400 Subject: [PATCH] update `port_map` to fix wrong web UI port and minimize potential port conflicts (#33) Signed-off-by: Tiger Wang --- Apps/AdGuardHome/docker-compose.yml | 4 ++-- Apps/AllTubeDownload/docker-compose.yml | 4 ++-- Apps/FileBrowser/docker-compose.yml | 4 ++-- Apps/Gitea/docker-compose.yml | 4 ++-- Apps/Grafana/docker-compose.yml | 4 ++-- Apps/Nextcloud/docker-compose.yml | 2 +- Apps/OpenSpeedTest/docker-compose.yml | 4 ++-- Apps/Pihole/docker-compose.yml | 2 +- Apps/Sabnzbd/docker-compose.yml | 4 ++-- Apps/Smokeping/docker-compose.yml | 4 ++-- Apps/TailscaleDaemon/docker-compose.yml | 4 ++++ Apps/Unifi-controller/docker-compose.yml | 4 ++-- Apps/Vaultwarden/docker-compose.yml | 4 ++-- Apps/VoceChat/docker-compose.yml | 2 +- Apps/qBittorrent/docker-compose.yml | 4 ++-- 15 files changed, 29 insertions(+), 25 deletions(-) diff --git a/Apps/AdGuardHome/docker-compose.yml b/Apps/AdGuardHome/docker-compose.yml index 2fcb8ca..163cb2d 100644 --- a/Apps/AdGuardHome/docker-compose.yml +++ b/Apps/AdGuardHome/docker-compose.yml @@ -15,7 +15,7 @@ services: published: "53" protocol: udp - target: 3000 - published: "3000" + published: "3001" protocol: tcp - target: 853 published: "853" @@ -33,7 +33,7 @@ services: target: /opt/adguardhome/conf x-casaos: index: / - port_map: "3000" + port_map: "3001" ports: - container: "53" description: diff --git a/Apps/AllTubeDownload/docker-compose.yml b/Apps/AllTubeDownload/docker-compose.yml index d9c1a2c..2ba0507 100644 --- a/Apps/AllTubeDownload/docker-compose.yml +++ b/Apps/AllTubeDownload/docker-compose.yml @@ -9,12 +9,12 @@ services: network_mode: bridge ports: - target: 80 - published: "80" + published: "10480" protocol: tcp restart: always x-casaos: index: / - port_map: "80" + port_map: "10480" ports: - container: "80" description: diff --git a/Apps/FileBrowser/docker-compose.yml b/Apps/FileBrowser/docker-compose.yml index 2bb4fa1..09e2def 100644 --- a/Apps/FileBrowser/docker-compose.yml +++ b/Apps/FileBrowser/docker-compose.yml @@ -13,7 +13,7 @@ services: network_mode: bridge ports: - target: 80 - published: "80" + published: "10180" protocol: tcp restart: unless-stopped volumes: @@ -38,7 +38,7 @@ services: en_us: Run FileBrowser as specified gid. zh_cn: 以指定的组ID运行FileBrowser index: / - port_map: "80" + port_map: "10180" ports: - container: "80" description: diff --git a/Apps/Gitea/docker-compose.yml b/Apps/Gitea/docker-compose.yml index 5ca197d..164fe3b 100644 --- a/Apps/Gitea/docker-compose.yml +++ b/Apps/Gitea/docker-compose.yml @@ -12,7 +12,7 @@ services: network_mode: bridge ports: - target: 3000 - published: "3000" + published: "3002" protocol: tcp - target: 22 published: "222" @@ -33,7 +33,7 @@ services: en_us: The GID (Unix group ID) of the user that runs Gitea zh_cn: Gitea 运行的用户的 GID（Unix 组 ID） index: / - port_map: "3000" + port_map: "3002" ports: - container: "3000" description: diff --git a/Apps/Grafana/docker-compose.yml b/Apps/Grafana/docker-compose.yml index 80823b7..811340f 100644 --- a/Apps/Grafana/docker-compose.yml +++ b/Apps/Grafana/docker-compose.yml @@ -9,12 +9,12 @@ services: network_mode: bridge ports: - target: 3000 - published: "3000" + published: "3003" protocol: tcp restart: always x-casaos: index: / - port_map: "3000" + port_map: "3003" ports: - container: "3000" description: diff --git a/Apps/Nextcloud/docker-compose.yml b/Apps/Nextcloud/docker-compose.yml index cafa6cb..a3afbed 100644 --- a/Apps/Nextcloud/docker-compose.yml +++ b/Apps/Nextcloud/docker-compose.yml @@ -21,7 +21,7 @@ services: target: /var/www/html x-casaos: index: / - port_map: "80" + port_map: "10080" ports: - container: "80" description: diff --git a/Apps/OpenSpeedTest/docker-compose.yml b/Apps/OpenSpeedTest/docker-compose.yml index 36c6aa3..2880a00 100644 --- a/Apps/OpenSpeedTest/docker-compose.yml +++ b/Apps/OpenSpeedTest/docker-compose.yml @@ -9,12 +9,12 @@ services: network_mode: bridge ports: - target: 3000 - published: "3000" + published: "3004" protocol: tcp restart: always x-casaos: index: / - port_map: "3000" + port_map: "3004" ports: - container: "3000" description: diff --git a/Apps/Pihole/docker-compose.yml b/Apps/Pihole/docker-compose.yml index 7e3d5bf..046a2d4 100644 --- a/Apps/Pihole/docker-compose.yml +++ b/Apps/Pihole/docker-compose.yml @@ -54,7 +54,7 @@ services: description: en_us: Pi-hole PROXY_LOCATION index: /admin - port_map: "80" + port_map: "8800" ports: - container: "80" description: diff --git a/Apps/Sabnzbd/docker-compose.yml b/Apps/Sabnzbd/docker-compose.yml index 6ac5c8f..ed72b34 100644 --- a/Apps/Sabnzbd/docker-compose.yml +++ b/Apps/Sabnzbd/docker-compose.yml @@ -13,7 +13,7 @@ services: network_mode: bridge ports: - target: 8080 - published: "8080" + published: "8282" protocol: tcp restart: unless-stopped volumes: @@ -37,7 +37,7 @@ services: - container: TZ description: en_us: "" - port_map: "8080" + port_map: "8282" ports: - container: "8080" description: diff --git a/Apps/Smokeping/docker-compose.yml b/Apps/Smokeping/docker-compose.yml index 013caa8..8b6146b 100644 --- a/Apps/Smokeping/docker-compose.yml +++ b/Apps/Smokeping/docker-compose.yml @@ -13,7 +13,7 @@ services: network_mode: bridge ports: - target: 80 - published: "80" + published: "10280" protocol: tcp restart: unless-stopped volumes: @@ -34,7 +34,7 @@ services: - container: TZ description: en_us: "" - port_map: "80" + port_map: "10280" ports: - container: "80" description: diff --git a/Apps/TailscaleDaemon/docker-compose.yml b/Apps/TailscaleDaemon/docker-compose.yml index 9d2609b..39e8849 100644 --- a/Apps/TailscaleDaemon/docker-compose.yml +++ b/Apps/TailscaleDaemon/docker-compose.yml @@ -105,12 +105,16 @@ x-casaos: After install: Go to the container log and connect to your tailscale account using the link provided + + NOTE: The default port for this app is 80, which might conflict with CasaOS. Consider changing CasaOS port before installing. zh_cn: | Tailscale 主机名：`casaos` 安装后： 前往容器日志并使用提供的链接连接到您的 tailscale 帐户 + + 注意：此应用程序的默认端口为 80，这可能与 CasaOS 冲突。在安装之前考虑更改 CasaOS 端口。 title: en_us: Tailscale Daemon zh_cn: Tailscale 守护进程 diff --git a/Apps/Unifi-controller/docker-compose.yml b/Apps/Unifi-controller/docker-compose.yml index 19c0e48..323bc1a 100644 --- a/Apps/Unifi-controller/docker-compose.yml +++ b/Apps/Unifi-controller/docker-compose.yml @@ -20,7 +20,7 @@ services: published: "10001" protocol: udp - target: 8080 - published: "8080" + published: "8383" protocol: tcp - target: 8443 published: "8443" @@ -60,7 +60,7 @@ services: description: en_us: "" index: / - port_map: "8080" + port_map: "8383" ports: - container: "3478" description: diff --git a/Apps/Vaultwarden/docker-compose.yml b/Apps/Vaultwarden/docker-compose.yml index 0f2e00a..6d330e9 100644 --- a/Apps/Vaultwarden/docker-compose.yml +++ b/Apps/Vaultwarden/docker-compose.yml @@ -9,7 +9,7 @@ services: network_mode: bridge ports: - target: 80 - published: "80" + published: "10380" protocol: tcp restart: unless-stopped volumes: @@ -18,7 +18,7 @@ services: target: /data x-casaos: index: / - port_map: "80" + port_map: "10380" ports: - container: "80" description: diff --git a/Apps/VoceChat/docker-compose.yml b/Apps/VoceChat/docker-compose.yml index 31aeb7b..5e752a8 100644 --- a/Apps/VoceChat/docker-compose.yml +++ b/Apps/VoceChat/docker-compose.yml @@ -25,7 +25,7 @@ services: en_us: TimeZone zh_cn: 时区 index: / - port_map: "3000" + port_map: "3009" ports: - container: "3000" description: diff --git a/Apps/qBittorrent/docker-compose.yml b/Apps/qBittorrent/docker-compose.yml index 0f5e176..2d928a6 100644 --- a/Apps/qBittorrent/docker-compose.yml +++ b/Apps/qBittorrent/docker-compose.yml @@ -14,7 +14,7 @@ services: network_mode: bridge ports: - target: 8080 - published: "8080" + published: "8181" protocol: tcp restart: unless-stopped volumes: @@ -43,7 +43,7 @@ services: en_us: Run qBittorrent as specified UMASK. zh_cn: 以指定的 UMASK 运行 qBittorrent。 index: / - port_map: "8080" + port_map: "8181" ports: - container: "8080" description: