diff --git a/apps/traccar/6.10/conf/traccar.xml b/apps/traccar/6.10/conf/traccar.xml deleted file mode 100644 index 2b4518307..000000000 --- a/apps/traccar/6.10/conf/traccar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - org.h2.Driver - jdbc:h2:./data/database - sa - - - diff --git a/apps/traccar/6.10/data.yml b/apps/traccar/6.10/data.yml index 593618f34..4a47d729e 100644 --- a/apps/traccar/6.10/data.yml +++ b/apps/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/apps/traccar/6.10/docker-compose.yml b/apps/traccar/6.10/docker-compose.yml index 51245545f..6443c085f 100644 --- a/apps/traccar/6.10/docker-compose.yml +++ b/apps/traccar/6.10/docker-compose.yml @@ -11,7 +11,6 @@ services: restart: always networks: - traccar-network - hostname: traccar ports: - ${PANEL_APP_PORT_HTTP}:8082 env_file: @@ -19,4 +18,11 @@ services: - ${ENV_FILE:-/etc/1panel/envs/default.env} 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 + 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:-} diff --git a/apps/traccar/6.10/scripts/init.sh b/apps/traccar/6.10/scripts/init.sh index 7f45cbee6..07fb8c3fe 100644 --- a/apps/traccar/6.10/scripts/init.sh +++ b/apps/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