add default bridge for services without network_mode:

Cp0204 · Jun 29, 2024 · cdff91b · cdff91b
1 parent e3f3118
commit cdff91b
Show file tree

Hide file tree

Showing 43 changed files with 107 additions and 54 deletions.
diff --git a/Apps/BiliBiliToolPro/docker-compose.yml b/Apps/BiliBiliToolPro/docker-compose.yml
@@ -37,7 +37,8 @@ x-casaos:
   thumbnail: https://cdn.jsdelivr.net/gh/Cp0204/CasaOS-AppStore-Play@main/Apps/BiliBiliToolPro/thumbnail.png
   tips:
     before_install:
-      en_us: Steps
+      en_us: |
+        Steps
 
         1. Create a `cookies.json` file before installing, and run it on the host machine
 
@@ -54,7 +55,8 @@ x-casaos:
 
 
         [Documentation](https://github.com/RayWangQvQ/BiliBiliToolPro/blob/main/docker/README.md)
-      zh_cn: 使用步骤
+      zh_cn: |
+        使用步骤
 
         1. 安装前建立**cookies.json**文件，在宿主机运行
 

diff --git a/Apps/LinkAce/docker-compose.yml b/Apps/LinkAce/docker-compose.yml
@@ -64,7 +64,8 @@ x-casaos:
     zh_cn: 管理您的书签和链接
   tips:
     before_install:
-      en_us: Steps
+      en_us: |
+        Steps
 
         1. Create the **.env** file before installation and run it on the host machine
 
@@ -78,7 +79,8 @@ x-casaos:
 
 
         [Official documentation](https://www.linkace.org/docs/v1/setup/setup-with-docker/simple/)
-      zh_cn: 使用步骤
+      zh_cn: |
+        使用步骤
 
         1. 安装前建立 **.env** 文件，在宿主机运行
 

diff --git a/Apps/MariaDB/docker-compose.yml b/Apps/MariaDB/docker-compose.yml
@@ -41,6 +41,8 @@ services:
           description:
             en_us: MariaDB Port
             zh_cn: MariaDB 端口
+    network_mode: bridge
+
 x-casaos:
   architectures:
     - amd64

diff --git a/Apps/adminer/docker-compose.yml b/Apps/adminer/docker-compose.yml
@@ -14,6 +14,8 @@ services:
           description:
             en_us: Adminer HTTP Port
             zh_cn: Adminer HTTP 端口
+    network_mode: bridge
+
 x-casaos:
   architectures:
     - amd64

diff --git a/Apps/affine/docker-compose.yml b/Apps/affine/docker-compose.yml
@@ -3,8 +3,7 @@ services:
   affine:
     image: ghcr.io/toeverything/affine-graphql:stable
     container_name: affine-app
-    command:
-      ['sh', '-c', 'node ./scripts/self-host-predeploy && node ./dist/index.js']
+    command: ['sh', '-c', 'node ./scripts/self-host-predeploy && node ./dist/index.js']
     ports:
       - "3010:3010"
       - "5555:5555"
@@ -121,4 +120,4 @@ x-casaos:
   title:
     en_us: AFFiNE
   index: /
-  port_map: "3010"
+  port_map: "3010"
diff --git a/Apps/baidunetdisk/docker-compose.yml b/Apps/baidunetdisk/docker-compose.yml
@@ -39,7 +39,8 @@ x-casaos:
     zh_cn: VNC运行百度网盘
   tips:
     before_install:
-      en_us: "Default access password: `vncpassword`, can be changed by environment variable `VNC_PASSWORD`.
+      en_us: |
+        Default access password: `vncpassword`, can be changed by environment variable `VNC_PASSWORD`.
 
         1. default VNC port 5900, if you don't use VNC client to connect you can remove the 5900 mapping.
 
@@ -48,8 +49,9 @@ x-casaos:
         3. Note: If Baidu.com pops up an upgrade prompt inside the container, Please ignore it.
 
 
-        [Project documentation](https://hub.docker.com/r/johngong/baidunetdisk)"
-      zh_cn: 默认访问密码：`vncpassword`，可通过环境变量`VNC_PASSWORD`修改。
+        [Project documentation](https://hub.docker.com/r/johngong/baidunetdisk)
+      zh_cn: |
+        默认访问密码：`vncpassword`，可通过环境变量`VNC_PASSWORD`修改。
 
         1. 默认VNC端口5900，如果不用VNC客户端连接可删除5900映射。
 

diff --git a/Apps/cyberchef/docker-compose.yml b/Apps/cyberchef/docker-compose.yml
@@ -36,4 +36,4 @@ x-casaos:
   title:
     en_us: CyberChef
   index: /
-  port_map: "8088"
+  port_map: "8088"
diff --git a/Apps/dify/docker-compose.yml b/Apps/dify/docker-compose.yml
@@ -117,7 +117,7 @@ services:
     volumes:
       - /DATA/AppData/dify/db/data:/var/lib/postgresql/data
     healthcheck:
-      test: [ "CMD", "pg_isready" ]
+      test: ["CMD", "pg_isready"]
       interval: 1s
       timeout: 3s
       retries: 30
@@ -135,7 +135,7 @@ services:
       - --requirepass
       - difyai123456
     healthcheck:
-      test: [ "CMD", "redis-cli", "ping" ]
+      test: ["CMD", "redis-cli", "ping"]
     networks:
       - dify
 
@@ -277,7 +277,7 @@ x-casaos:
         - `dify` service
           - APP_API_URL
           - CONSOLE_API_URL
-      zh_cn: |
+      zh_cn: |-
         这是 Play 商店源中我适配过最复杂的应用，我做了大量适配工作，但依然无法达到一键安装、开箱即用的状态。
 
         虽然如此，请不要被吓退，放弃体验这个优秀的应用将会是你的损失。
@@ -315,4 +315,4 @@ x-casaos:
           - SERVICE_API_URL
         - `dify` 服务
           - APP_API_URL
-          - CONSOLE_API_URL
+          - CONSOLE_API_URL
diff --git a/Apps/dsm/docker-compose.yml b/Apps/dsm/docker-compose.yml
@@ -46,12 +46,14 @@ x-casaos:
     zh_cn: Virtual DSM
   tips:
     before_install:
-      en_us: 1. Requires `DATA/AppData` free space 16G+
+      en_us: |
+        1. Requires `DATA/AppData` free space 16G+
 
         2. For the safety of your data, please read [documentation](https://hub.docker.com/r/vdsm/virtual-dsm) first
 
         3. The first run will download the system package and initialization online, please be patient, you can check the progress in the container log.
-      zh_cn: 1. 需要 `/DATA/AppData` 空闲空间 16G+
+      zh_cn: |
+        1. 需要 `/DATA/AppData` 空闲空间 16G+
 
         2. 为了你的数据安全，请先阅读 [文档](https://hub.docker.com/r/vdsm/virtual-dsm)
 

diff --git a/Apps/fast-os-docker/docker-compose.yml b/Apps/fast-os-docker/docker-compose.yml
@@ -27,6 +27,8 @@ services:
       - type: bind
         source: /DATA/AppData/fastosdocker/data
         target: /fast/data
+    network_mode: bridge
+
 x-casaos:
   architectures:
     - amd64

diff --git a/Apps/fastgpt/docker-compose.yml b/Apps/fastgpt/docker-compose.yml
@@ -91,7 +91,8 @@ x-casaos:
     zh_cn: FastGPT
   tips:
     before_install:
-      en_us: Installation steps
+      en_us: |
+        Installation steps
 
         1. Create the **config.json** file before installation and run it on the host
 
@@ -105,7 +106,8 @@ x-casaos:
 
 
         [Documentation](https://doc.fastgpt.in/docs/development/docker/)
-      zh_cn: 安装步骤
+      zh_cn: |
+        安装步骤
 
         1. 安装前先建立**config.json**文件，在宿主机运行
 
@@ -122,4 +124,4 @@ x-casaos:
     custom: null
   port_map: '3000'
   scheme: http
-  index: /
+  index: /
diff --git a/Apps/firefly-iii/docker-compose.yml b/Apps/firefly-iii/docker-compose.yml
@@ -231,4 +231,4 @@ x-casaos:
   title:
     en_us: Firefly III
   index: /
-  port_map: "38080"
+  port_map: "38080"
diff --git a/Apps/immich/docker-compose.yml b/Apps/immich/docker-compose.yml
@@ -71,7 +71,7 @@ services:
       interval: 5m
       start_interval: 30s
       start_period: 5m
-    command: ["postgres", "-c" ,"shared_preload_libraries=vectors.so", "-c", 'search_path="$$user", public, vectors', "-c", "logging_collector=on", "-c", "max_wal_size=2GB", "-c", "shared_buffers=512MB", "-c", "wal_compression=on"]
+    command: ["postgres", "-c", "shared_preload_libraries=vectors.so", "-c", 'search_path="$$user", public, vectors', "-c", "logging_collector=on", "-c", "max_wal_size=2GB", "-c", "shared_buffers=512MB", "-c", "wal_compression=on"]
     restart: unless-stopped
     networks:
       - immich

diff --git a/Apps/laftools/docker-compose.yml b/Apps/laftools/docker-compose.yml
@@ -18,6 +18,7 @@ services:
       resources:
         reservations:
           memory: 256M
+    network_mode: bridge
 
 x-casaos:
   architectures:
@@ -42,4 +43,4 @@ x-casaos:
     en_us: LafTools
     zh_cn: 秒达工具箱
   index: /
-  port_map: "39899"
+  port_map: "39899"
diff --git a/Apps/lancache/docker-compose.yml b/Apps/lancache/docker-compose.yml
@@ -17,6 +17,7 @@ services:
       - target: 53
         published: 53
         protocol: udp
+    network_mode: bridge
 
   monolithic:
     image: lancachenet/monolithic:latest
@@ -43,6 +44,7 @@ services:
       - type: bind
         source: /DATA/AppData/lancache/logs
         target: /data/logs
+    network_mode: bridge
 
 x-casaos:
   architectures:

diff --git a/Apps/linkstack/docker-compose.yml b/Apps/linkstack/docker-compose.yml
@@ -24,6 +24,7 @@ services:
       resources:
         reservations:
           memory: 256M
+    network_mode: bridge
 
 x-casaos:
   architectures:
@@ -50,7 +51,7 @@ x-casaos:
     before_install:
       en_us: |
         This application does not have persistent storage set by default, which means you will lose your application data once you reset the container!
-        
+
         You can set up file mounts yourself to achieve persistent configuration directories, for more information [please refer](https://github.com/LinkStackOrg/linkstack-docker#persistent-storage)
       zh_cn: |
         本应用默认没有设置持久化存储，意味着你一旦重置容器，将丢失应用数据！
@@ -59,4 +60,4 @@ x-casaos:
   title:
     en_us: LinkStack
   index: /
-  port_map: "8081"
+  port_map: "8081"
diff --git a/Apps/maxkb/docker-compose.yml b/Apps/maxkb/docker-compose.yml
@@ -15,6 +15,7 @@ services:
         source: /DATA/AppData/maxkb/data
         target: /var/lib/postgresql/data
     container_name: maxkb
+    network_mode: bridge
 
 x-casaos:
   architectures:
@@ -43,4 +44,4 @@ x-casaos:
   title:
     en_us: MaxKB
   index: /
-  port_map: "18080"
+  port_map: "18080"
diff --git a/Apps/mealie/docker-compose.yml b/Apps/mealie/docker-compose.yml
@@ -25,6 +25,8 @@ services:
       MAX_WORKERS: "1"
       WEB_CONCURRENCY: "1"
       BASE_URL: https://mealie.yourdomain.com
+    network_mode: bridge
+
 x-casaos:
   architectures:
     - arm64
@@ -63,4 +65,4 @@ x-casaos:
   title:
     en_us: Mealie
   index: /
-  port_map: "9925"
+  port_map: "9925"
diff --git a/Apps/movie-robot/docker-compose.yml b/Apps/movie-robot/docker-compose.yml
@@ -27,6 +27,7 @@ services:
           description:
             en_us: "License Key"
             zh_cn: "许可证密钥"
+    network_mode: bridge
 
 x-casaos:
   architectures:

diff --git a/Apps/moviepilot/docker-compose.yml b/Apps/moviepilot/docker-compose.yml
@@ -33,6 +33,7 @@ services:
       resources:
         reservations:
           memory: 256M
+    network_mode: bridge
 
 # networks:
 #   moviepilot:

diff --git a/Apps/myip/docker-compose.yml b/Apps/myip/docker-compose.yml
@@ -12,6 +12,8 @@ services:
       resources:
         reservations:
           memory: 128M
+    network_mode: bridge
+
 x-casaos:
   architectures:
     - arm64
@@ -36,4 +38,4 @@ x-casaos:
     en_us: MyIP
     zh_cn: IP工具箱
   index: /
-  port_map: "18966"
+  port_map: "18966"
diff --git a/Apps/nextchat/docker-compose.yml b/Apps/nextchat/docker-compose.yml
@@ -29,6 +29,8 @@ services:
           description:
             en_us: Override OpenAI API request base URL.
             zh_cn: 覆盖 OpenAI API 请求基础 URL。
+    network_mode: bridge
+
 x-casaos:
   architectures:
     - amd64

diff --git a/Apps/ntfy/docker-compose.yml b/Apps/ntfy/docker-compose.yml
@@ -20,6 +20,8 @@ services:
       resources:
         reservations:
           memory: 128M
+    network_mode: bridge
+
 x-casaos:
   architectures:
     - arm
@@ -43,4 +45,4 @@ x-casaos:
   title:
     en_us: ntfy
   index: /
-  port_map: "3380"
+  port_map: "3380"
diff --git a/Apps/one-api/docker-compose.yml b/Apps/one-api/docker-compose.yml
@@ -18,6 +18,8 @@ services:
       resources:
         reservations:
           memory: 128M
+    network_mode: bridge
+
 x-casaos:
   architectures:
     - amd64
@@ -28,15 +30,15 @@ x-casaos:
   category: Developer
   description:
     en_us: OpenAI API management & redistribution system, using a single API for all LLMs, and features an English UI.
-    zh_cn:  OpenAI 接口管理 & 分发系统，支持 Azure、Anthropic Claude、Google PaLM 2 & Gemini、智谱 ChatGLM、百度文心一言、讯飞星火认知、阿里通义千问、360 智脑以及腾讯混元，可用于二次分发管理 key，仅单可执行文件，已打包好 Docker 镜像，一键部署，开箱即用。
+    zh_cn: OpenAI 接口管理 & 分发系统，支持 Azure、Anthropic Claude、Google PaLM 2 & Gemini、智谱 ChatGLM、百度文心一言、讯飞星火认知、阿里通义千问、360 智脑以及腾讯混元，可用于二次分发管理 key，仅单可执行文件，已打包好 Docker 镜像，一键部署，开箱即用。
   developer: songquanpeng
   icon: https://cdn.jsdelivr.net/gh/Cp0204/CasaOS-AppStore-Play@main/Apps/one-api/icon.png
   screenshot_link:
     - https://cdn.jsdelivr.net/gh/Cp0204/CasaOS-AppStore-Play@main/Apps/one-api/screenshot-1.png
     - https://cdn.jsdelivr.net/gh/Cp0204/CasaOS-AppStore-Play@main/Apps/one-api/screenshot-2.png
   tagline:
     en_us: One API for All LLMs
-    zh_cn:  一个API分发所有大模型
+    zh_cn: 一个API分发所有大模型
   thumbnail: https://cdn.jsdelivr.net/gh/Cp0204/CasaOS-AppStore-Play@main/Apps/one-api/thumbnail.png
   title:
     zh_cn: One API
@@ -48,7 +50,7 @@ x-casaos:
         The initial account username is `root` and the password is `123456`.
 
         **Be sure to change the default password after logging in to the system with the root user for the first time!**
-      zh_cn: |
+      zh_cn: |-
         初始账号用户名为 `root`，密码为 `123456`。
 
-        **使用 root 用户初次登录系统后，务必修改默认密码！**
+        **使用 root 用户初次登录系统后，务必修改默认密码！**