Merge remote-tracking branch 'origin/custom' into custom

appstore/dify/0.15.3/.env

@@ -7,21 +7,24 @@ PANEL_APP_PORT_HTTP=8080
 # WebUI SSL 端口 [必填] 
 PANEL_APP_PORT_HTTPS=8443
 
+# 数据库端口 [必填] 
+EXPOSE_DB_PORT=5432
+
 # 插件调试端口 [必填] 
-PLUGIN_DEBUGGING_PORT=5003
+EXPOSE_PLUGIN_DEBUGGING_PORT=5003
 
-# Milvus 端口 [必填] 
-MILVUS_STANDALONE_PORT1=19530
+# Milvus 接口端口 [必填] 
+MILVUS_STANDALONE_API_PORT=19530
 
-# Milvus 端口 [必填] 
-MILVUS_STANDALONE_PORT2=9091
+# Milvus 服务端口 [必填] 
+MILVUS_STANDALONE_SERVER_PORT=9091
 
 # MyScale 端口 [必填] 
 MYSCALE_PORT=8123
 
 # Elasticsearch 端口 [必填] 
-ELASTICSEARCH_PORT=9200
+ELASTICSEARCH_PORT=8123
 
 # Kibana 端口 [必填] 
-KIBANA_PORT=5601
+KIBANA_PORT=8123
 

appstore/dify/0.15.3/data.yml

@@ -23,9 +23,17 @@ additionalProperties:
       required: true
       rule: paramPort
       type: number
+    - default: 5432
+      edit: true
+      envKey: EXPOSE_DB_PORT
+      labelZh: 数据库端口
+      labelEn: Database port
+      required: true
+      rule: paramPort
+      type: number
     - default: 5003
       edit: true
-      envKey: PLUGIN_DEBUGGING_PORT
+      envKey: EXPOSE_PLUGIN_DEBUGGING_PORT
       labelZh: 插件调试端口
       labelEn: Plugin debugging port
       required: true
@@ -33,17 +41,18 @@ additionalProperties:
       type: number
     - default: 19530
       disabled: true
-      envKey: MILVUS_STANDALONE_PORT1
-      labelZh: Milvus 端口
-      labelEn: Milvus port
+      edit: true
+      envKey: MILVUS_STANDALONE_API_PORT
+      labelZh: Milvus 接口端口
+      labelEn: Milvus API port
       required: true
       rule: paramPort
       type: number
     - default: 9091
       disabled: true
-      envKey: MILVUS_STANDALONE_PORT2
-      labelZh: Milvus 端口
-      labelEn: Milvus port
+      envKey: MILVUS_STANDALONE_SERVER_PORT
+      labelZh: Milvus 服务端口
+      labelEn: Milvus server port
       required: true
       rule: paramPort
       type: number
@@ -55,7 +64,7 @@ additionalProperties:
       required: true
       rule: paramPort
       type: number
-    - default: 9200
+    - default: 8123
       edit: true
       envKey: ELASTICSEARCH_PORT
       labelZh: Elasticsearch 端口
@@ -63,7 +72,7 @@ additionalProperties:
       required: true
       rule: paramPort
       type: number
-    - default: 5601
+    - default: 8123
       edit: true
       envKey: KIBANA_PORT
       labelZh: Kibana 端口

appstore/dify/0.15.3/scripts/init.sh

@@ -16,6 +16,19 @@ if [ -f .env ]; then
 
   cp -r conf/. "$DIFY_ROOT_PATH/"
 
+  # setup-3 sync environment variables
+  env_source="envs/dify.env"
+  if [ -f "$env_source" ]; then
+    while IFS='=' read -r key value; do
+      if [[ -z "$key" || "$key" =~ ^# ]]; then
+        continue
+      fi
+      if ! grep -q "^$key=" .env; then
+        echo "$key=$value" >> .env
+      fi
+    done < "$env_source"
+  fi
+
   echo "Check Finish."
 
 else

appstore/dify/0.15.3/scripts/upgrade.sh

@@ -27,6 +27,19 @@ if [ -f .env ]; then
       echo "Warning: conf directory not found."
     fi
 
+  # setup-3 sync environment variables
+  env_source="envs/dify.env"
+  if [ -f "$env_source" ]; then
+    while IFS='=' read -r key value; do
+      if [[ -z "$key" || "$key" =~ ^# ]]; then
+        continue
+      fi
+      if ! grep -q "^$key=" .env; then
+        echo "$key=$value" >> .env
+      fi
+    done < "$env_source"
+  fi
+
   echo "Check Finish."
 
 else

appstore/macos/1.22/docker-compose.yml

@@ -14,7 +14,7 @@ services:
     - .env
     environment:
     - VERSION=${VERSION}
-    image: dockurr/macos:1.21
+    image: dockurr/macos:1.22
     labels:
       createdBy: Apps
     networks:

appstore/rsshub/2025-02-17/docker-compose.yml

@@ -57,7 +57,7 @@ services:
       - -f
       - http://localhost:1200/healthz?key=${ACCESS_KEY}
       timeout: 10s
-    image: diygod/rsshub:2025-02-15
+    image: diygod/rsshub:2025-02-17
     labels:
       createdBy: Apps
     networks:

dockge/dify/.env

@@ -7,21 +7,24 @@ PANEL_APP_PORT_HTTP=8080
 # WebUI SSL 端口 [必填] 
 PANEL_APP_PORT_HTTPS=8443
 
+# 数据库端口 [必填] 
+EXPOSE_DB_PORT=5432
+
 # 插件调试端口 [必填] 
-PLUGIN_DEBUGGING_PORT=5003
+EXPOSE_PLUGIN_DEBUGGING_PORT=5003
 
-# Milvus 端口 [必填] 
-MILVUS_STANDALONE_PORT1=19530
+# Milvus 接口端口 [必填] 
+MILVUS_STANDALONE_API_PORT=19530
 
-# Milvus 端口 [必填] 
-MILVUS_STANDALONE_PORT2=9091
+# Milvus 服务端口 [必填] 
+MILVUS_STANDALONE_SERVER_PORT=9091
 
 # MyScale 端口 [必填] 
 MYSCALE_PORT=8123
 
 # Elasticsearch 端口 [必填] 
-ELASTICSEARCH_PORT=9200
+ELASTICSEARCH_PORT=8123
 
 # Kibana 端口 [必填] 
-KIBANA_PORT=5601
+KIBANA_PORT=8123
 

dockge/macos/docker-compose.yml

@@ -14,7 +14,7 @@ services:
     - .env
     environment:
     - VERSION=${VERSION}
-    image: dockurr/macos:1.21
+    image: dockurr/macos:1.22
     labels:
       createdBy: Apps
     networks:

dockge/rsshub/docker-compose.yml

@@ -57,7 +57,7 @@ services:
       - -f
       - http://localhost:1200/healthz?key=${ACCESS_KEY}
       timeout: 10s
-    image: diygod/rsshub:2025-02-15
+    image: diygod/rsshub:2025-02-17
     labels:
       createdBy: Apps
     networks: