diff --git a/booklore/.env b/booklore/.env index 853c9e4..8cd3f89 100644 --- a/booklore/.env +++ b/booklore/.env @@ -1,16 +1,18 @@ -# BookLore应用设置 -APP_USER_ID=0 -APP_GROUP_ID=0 -TZ=Asia/Shanghai -BOOKLORE_PORT=6060 +# 应用设置 +APP_USER_ID=1000 +APP_GROUP_ID=1000 +TZ=Etc/UTC -# 数据库连接 +# 数据库设置 DATABASE_URL=jdbc:mariadb://mariadb:3306/booklore DB_USER=booklore -DB_PASSWORD=ChangeMe_BookLoreApp_2025! +DB_PASSWORD=5KdwTTCnxqNx -# MariaDB容器设置 +# 存储设置 +DISK_TYPE=LOCAL + +# MariaDB DB_USER_ID=1000 DB_GROUP_ID=1000 -MYSQL_ROOT_PASSWORD=ChangeMe_MariaDBRoot_2025! +MYSQL_ROOT_PASSWORD=my8MGIFlSVUU MYSQL_DATABASE=booklore \ No newline at end of file diff --git a/booklore/docker-compose.yml b/booklore/docker-compose.yml index 77d063b..30c3e6f 100644 --- a/booklore/docker-compose.yml +++ b/booklore/docker-compose.yml @@ -1,6 +1,6 @@ services: booklore: - image: booklore/booklore:v1.17.0 + image: ghcr.io/booklore-app/booklore:v2.3.1 container_name: booklore environment: - USER_ID=${APP_USER_ID} @@ -9,18 +9,18 @@ services: - DATABASE_URL=${DATABASE_URL} - DATABASE_USERNAME=${DB_USER} - DATABASE_PASSWORD=${DB_PASSWORD} - - BOOKLORE_PORT=${BOOKLORE_PORT} + - DISK_TYPE=${DISK_TYPE} depends_on: mariadb: condition: service_healthy ports: - - "${BOOKLORE_PORT}:${BOOKLORE_PORT}" + - "6060:6060" volumes: - ./data:/app/data - ./books:/books - ./bookdrop:/bookdrop healthcheck: - test: wget -q -O - http://localhost:${BOOKLORE_PORT}/api/v1/healthcheck + test: wget -q -O - http://localhost:6060/api/v1/healthcheck interval: 60s retries: 5 start_period: 60s @@ -28,7 +28,7 @@ services: restart: unless-stopped mariadb: - image: linuxserver/mariadb:11.4.5 + image: lscr.io/linuxserver/mariadb:11.4.5 container_name: mariadb environment: - PUID=${DB_USER_ID}