diff --git a/appstore/astrbot-napcat/4.9.8/.env b/appstore/astrbot-napcat/4.9.10/.env
similarity index 100%
rename from appstore/astrbot-napcat/4.9.8/.env
rename to appstore/astrbot-napcat/4.9.10/.env
diff --git a/appstore/astrbot-napcat/4.9.8/data.yml b/appstore/astrbot-napcat/4.9.10/data.yml
similarity index 100%
rename from appstore/astrbot-napcat/4.9.8/data.yml
rename to appstore/astrbot-napcat/4.9.10/data.yml
diff --git a/appstore/astrbot-napcat/4.9.8/docker-compose.yml b/appstore/astrbot-napcat/4.9.10/docker-compose.yml
similarity index 96%
rename from appstore/astrbot-napcat/4.9.8/docker-compose.yml
rename to appstore/astrbot-napcat/4.9.10/docker-compose.yml
index 573c009ff..44730d55d 100644
--- a/appstore/astrbot-napcat/4.9.8/docker-compose.yml
+++ b/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
diff --git a/appstore/astrbot-napcat/4.9.8/envs/default.env b/appstore/astrbot-napcat/4.9.10/envs/default.env
similarity index 100%
rename from appstore/astrbot-napcat/4.9.8/envs/default.env
rename to appstore/astrbot-napcat/4.9.10/envs/default.env
diff --git a/appstore/astrbot-napcat/4.9.8/envs/global.env b/appstore/astrbot-napcat/4.9.10/envs/global.env
similarity index 100%
rename from appstore/astrbot-napcat/4.9.8/envs/global.env
rename to appstore/astrbot-napcat/4.9.10/envs/global.env
diff --git a/appstore/astrbot-napcat/4.9.8/scripts/init.sh b/appstore/astrbot-napcat/4.9.10/scripts/init.sh
similarity index 100%
rename from appstore/astrbot-napcat/4.9.8/scripts/init.sh
rename to appstore/astrbot-napcat/4.9.10/scripts/init.sh
diff --git a/appstore/astrbot-napcat/4.9.8/scripts/uninstall.sh b/appstore/astrbot-napcat/4.9.10/scripts/uninstall.sh
similarity index 100%
rename from appstore/astrbot-napcat/4.9.8/scripts/uninstall.sh
rename to appstore/astrbot-napcat/4.9.10/scripts/uninstall.sh
diff --git a/appstore/astrbot-napcat/4.9.8/scripts/upgrade.sh b/appstore/astrbot-napcat/4.9.10/scripts/upgrade.sh
similarity index 100%
rename from appstore/astrbot-napcat/4.9.8/scripts/upgrade.sh
rename to appstore/astrbot-napcat/4.9.10/scripts/upgrade.sh
diff --git a/appstore/ollama/0.12.7/.env b/appstore/ollama/0.12.8/.env
similarity index 100%
rename from appstore/ollama/0.12.7/.env
rename to appstore/ollama/0.12.8/.env
diff --git a/appstore/ollama/0.12.7/data.yml b/appstore/ollama/0.12.8/data.yml
similarity index 100%
rename from appstore/ollama/0.12.7/data.yml
rename to appstore/ollama/0.12.8/data.yml
diff --git a/appstore/ollama/0.12.7/docker-compose.yml b/appstore/ollama/0.12.8/docker-compose.yml
similarity index 95%
rename from appstore/ollama/0.12.7/docker-compose.yml
rename to appstore/ollama/0.12.8/docker-compose.yml
index a6609154e..8ecfbcc71 100644
--- a/appstore/ollama/0.12.7/docker-compose.yml
+++ b/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:
diff --git a/appstore/ollama/0.12.7/envs/default.env b/appstore/ollama/0.12.8/envs/default.env
similarity index 100%
rename from appstore/ollama/0.12.7/envs/default.env
rename to appstore/ollama/0.12.8/envs/default.env
diff --git a/appstore/ollama/0.12.7/envs/global.env b/appstore/ollama/0.12.8/envs/global.env
similarity index 100%
rename from appstore/ollama/0.12.7/envs/global.env
rename to appstore/ollama/0.12.8/envs/global.env
diff --git a/appstore/ollama/0.12.7/scripts/init.sh b/appstore/ollama/0.12.8/scripts/init.sh
similarity index 100%
rename from appstore/ollama/0.12.7/scripts/init.sh
rename to appstore/ollama/0.12.8/scripts/init.sh
diff --git a/appstore/ollama/0.12.7/scripts/uninstall.sh b/appstore/ollama/0.12.8/scripts/uninstall.sh
similarity index 100%
rename from appstore/ollama/0.12.7/scripts/uninstall.sh
rename to appstore/ollama/0.12.8/scripts/uninstall.sh
diff --git a/appstore/ollama/0.12.7/scripts/upgrade.sh b/appstore/ollama/0.12.8/scripts/upgrade.sh
similarity index 100%
rename from appstore/ollama/0.12.7/scripts/upgrade.sh
rename to appstore/ollama/0.12.8/scripts/upgrade.sh
diff --git a/appstore/traccar/6.10/.env b/appstore/traccar/6.10/.env
index e95cbeff9..5940bf777 100644
--- a/appstore/traccar/6.10/.env
+++ b/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
+
diff --git a/appstore/traccar/6.10/conf/traccar.xml b/appstore/traccar/6.10/conf/traccar.xml
deleted file mode 100644
index 2b4518307..000000000
--- a/appstore/traccar/6.10/conf/traccar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
- org.h2.Driver
- jdbc:h2:./data/database
- sa
-
-
-
diff --git a/appstore/traccar/6.10/data.yml b/appstore/traccar/6.10/data.yml
index 593618f34..4a47d729e 100644
--- a/appstore/traccar/6.10/data.yml
+++ b/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
diff --git a/appstore/traccar/6.10/docker-compose.yml b/appstore/traccar/6.10/docker-compose.yml
index 25d031ba8..c7bf44b1b 100644
--- a/appstore/traccar/6.10/docker-compose.yml
+++ b/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
diff --git a/appstore/traccar/6.10/scripts/init.sh b/appstore/traccar/6.10/scripts/init.sh
index 7f45cbee6..07fb8c3fe 100644
--- a/appstore/traccar/6.10/scripts/init.sh
+++ b/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
diff --git a/dockge/astrbot-napcat/docker-compose.yml b/dockge/astrbot-napcat/docker-compose.yml
index 573c009ff..44730d55d 100644
--- a/dockge/astrbot-napcat/docker-compose.yml
+++ b/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
diff --git a/dockge/ollama/docker-compose.yml b/dockge/ollama/docker-compose.yml
index a6609154e..8ecfbcc71 100644
--- a/dockge/ollama/docker-compose.yml
+++ b/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:
diff --git a/dockge/traccar/.env b/dockge/traccar/.env
index e95cbeff9..5940bf777 100644
--- a/dockge/traccar/.env
+++ b/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
+
diff --git a/dockge/traccar/conf/traccar.xml b/dockge/traccar/conf/traccar.xml
deleted file mode 100644
index 2b4518307..000000000
--- a/dockge/traccar/conf/traccar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
- org.h2.Driver
- jdbc:h2:./data/database
- sa
-
-
-
diff --git a/dockge/traccar/docker-compose.yml b/dockge/traccar/docker-compose.yml
index 25d031ba8..c7bf44b1b 100644
--- a/dockge/traccar/docker-compose.yml
+++ b/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