Processed apps directory via GitHub Actions

appstore/astrbot-napcat/4.9.10/docker-compose.yml

@@ -36,7 +36,7 @@ services:
     - MODE=astrbot
     - NAPCAT_UID=${NAPCAT_UID:-1000}
     - NAPCAT_GID=${NAPCAT_GID:-1000}
-    image: mlikiowa/napcat-docker:v4.9.8
+    image: mlikiowa/napcat-docker:v4.9.10
     mac_address: ${NAPCAT_MAC_ADDRESS:-02:42:ac:11:00:02}
     networks:
     - 1panel-network

appstore/ollama/0.12.8/docker-compose.yml

@@ -18,7 +18,7 @@ services:
     - OLLAMA_MAX_QUEUE=512
     - OLLAMA_FLASH_ATTENTION=0
     - OLLAMA_KV_CACHE_TYPE=f16
-    image: ollama/ollama:0.12.7
+    image: ollama/ollama:0.12.8
     labels:
       createdBy: Apps
     networks:

appstore/traccar/6.10/.env

@@ -4,3 +4,6 @@ TRACCAR_ROOT_PATH=/home/traccar
 # WebUI 端口 [必填] 
 PANEL_APP_PORT_HTTP=8082
 
+# WebUI 地址 [必填] 
+WEB_URL=http://127.0.0.1:8082
+

appstore/traccar/6.10/conf/traccar.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE properties SYSTEM 'http://java.sun.com/dtd/properties.dtd'>
-<properties>
-
-    <!-- Documentation: https://www.traccar.org/configuration-file/ -->
-
-    <entry key='database.driver'>org.h2.Driver</entry>
-    <entry key='database.url'>jdbc:h2:./data/database</entry>
-    <entry key='database.user'>sa</entry>
-    <entry key='database.password'></entry>
-
-</properties>

appstore/traccar/6.10/data.yml

@@ -15,3 +15,10 @@ additionalProperties:
       required: true
       rule: paramPort
       type: number
+    - default: "http://127.0.0.1:8082"
+      edit: true
+      envKey: WEB_URL
+      labelZh: WebUI 地址
+      labelEn: WebUI URL
+      required: true
+      type: text

appstore/traccar/6.10/docker-compose.yml

@@ -7,7 +7,13 @@ services:
     env_file:
     - ./envs/global.env
     - .env
-    hostname: traccar
+    environment:
+    - CONFIG_USE_ENVIRONMENT_VARIABLES=true
+    - WEB_URL=${WEB_URL:-http://127.0.0.1:8082}
+    - DATABASE_DRIVER=${DATABASE_DRIVER:-org.h2.Driver}
+    - DATABASE_URL=${DATABASE_URL:-jdbc:h2:./data/database}
+    - DATABASE_USER=${DATABASE_USER:-sa}
+    - DATABASE_PASSWORD=${DATABASE_PASSWORD:-}
     image: traccar/traccar:6.10
     labels:
       createdBy: Apps
@@ -18,4 +24,4 @@ services:
     restart: always
     volumes:
     - ${TRACCAR_ROOT_PATH}/logs:/opt/traccar/logs:rw
-    - ${TRACCAR_ROOT_PATH}/traccar.xml:/opt/traccar/conf/traccar.xml:ro
+    - ${TRACCAR_ROOT_PATH}/data:/opt/traccar/data:rw

appstore/traccar/6.10/scripts/init.sh

@@ -10,8 +10,6 @@ if [ -f .env ]; then
   echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env
   echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env
 
-  cp conf/traccar.xml "${TRACCAR_ROOT_PATH}/traccar.xml"
-
   echo "Check Finish."
 
 else

dockge/astrbot-napcat/docker-compose.yml

@@ -36,7 +36,7 @@ services:
     - MODE=astrbot
     - NAPCAT_UID=${NAPCAT_UID:-1000}
     - NAPCAT_GID=${NAPCAT_GID:-1000}
-    image: mlikiowa/napcat-docker:v4.9.8
+    image: mlikiowa/napcat-docker:v4.9.10
     mac_address: ${NAPCAT_MAC_ADDRESS:-02:42:ac:11:00:02}
     networks:
     - 1panel-network

dockge/ollama/docker-compose.yml

@@ -18,7 +18,7 @@ services:
     - OLLAMA_MAX_QUEUE=512
     - OLLAMA_FLASH_ATTENTION=0
     - OLLAMA_KV_CACHE_TYPE=f16
-    image: ollama/ollama:0.12.7
+    image: ollama/ollama:0.12.8
     labels:
       createdBy: Apps
     networks:

dockge/traccar/.env

@@ -4,3 +4,6 @@ TRACCAR_ROOT_PATH=/home/traccar
 # WebUI 端口 [必填] 
 PANEL_APP_PORT_HTTP=8082
 
+# WebUI 地址 [必填] 
+WEB_URL=http://127.0.0.1:8082
+

dockge/traccar/conf/traccar.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE properties SYSTEM 'http://java.sun.com/dtd/properties.dtd'>
-<properties>
-
-    <!-- Documentation: https://www.traccar.org/configuration-file/ -->
-
-    <entry key='database.driver'>org.h2.Driver</entry>
-    <entry key='database.url'>jdbc:h2:./data/database</entry>
-    <entry key='database.user'>sa</entry>
-    <entry key='database.password'></entry>
-
-</properties>

dockge/traccar/docker-compose.yml

@@ -7,7 +7,13 @@ services:
     env_file:
     - ./envs/global.env
     - .env
-    hostname: traccar
+    environment:
+    - CONFIG_USE_ENVIRONMENT_VARIABLES=true
+    - WEB_URL=${WEB_URL:-http://127.0.0.1:8082}
+    - DATABASE_DRIVER=${DATABASE_DRIVER:-org.h2.Driver}
+    - DATABASE_URL=${DATABASE_URL:-jdbc:h2:./data/database}
+    - DATABASE_USER=${DATABASE_USER:-sa}
+    - DATABASE_PASSWORD=${DATABASE_PASSWORD:-}
     image: traccar/traccar:6.10
     labels:
       createdBy: Apps
@@ -18,4 +24,4 @@ services:
     restart: always
     volumes:
     - ${TRACCAR_ROOT_PATH}/logs:/opt/traccar/logs:rw
-    - ${TRACCAR_ROOT_PATH}/traccar.xml:/opt/traccar/conf/traccar.xml:ro
+    - ${TRACCAR_ROOT_PATH}/data:/opt/traccar/data:rw