diff --git a/apps/lobe-chat-data/1.77.16/.env b/apps/lobe-chat-data/v1.970.0/.env similarity index 100% rename from apps/lobe-chat-data/1.77.16/.env rename to apps/lobe-chat-data/v1.970.0/.env diff --git a/apps/lobe-chat-data/1.77.16/data.yml b/apps/lobe-chat-data/v1.970.0/data.yml similarity index 100% rename from apps/lobe-chat-data/1.77.16/data.yml rename to apps/lobe-chat-data/v1.970.0/data.yml diff --git a/apps/lobe-chat-data/1.77.16/docker-compose.yml b/apps/lobe-chat-data/v1.970.0/docker-compose.yml similarity index 50% rename from apps/lobe-chat-data/1.77.16/docker-compose.yml rename to apps/lobe-chat-data/v1.970.0/docker-compose.yml index 9ff7eec..f83a39f 100644 --- a/apps/lobe-chat-data/1.77.16/docker-compose.yml +++ b/apps/lobe-chat-data/v1.970.0/docker-compose.yml @@ -4,83 +4,83 @@ services: container_name: lobe-network restart: always ports: - - '${MINIO_PORT}:${MINIO_PORT}' # MinIO API - - '9001:9001' # MinIO Console - - '${CASDOOR_PORT}:${CASDOOR_PORT}' # Casdoor - - '${PANEL_APP_PORT_HTTP}:3210' # LobeChat + - ${MINIO_PORT}:${MINIO_PORT} + - 9001:9001 + - ${CASDOOR_PORT}:${CASDOOR_PORT} + - ${PANEL_APP_PORT_HTTP}:3210 command: tail -f /dev/null networks: - lobe-network - postgresql: image: pgvector/pgvector:pg17 container_name: lobe-postgres ports: - - '5432:5432' + - 5432:5432 volumes: - - './data:/var/lib/postgresql/data' + - ./data:/var/lib/postgresql/data environment: - - 'POSTGRES_DB=${LOBE_DB_NAME}' - - 'POSTGRES_PASSWORD=${POSTGRES_PASSWORD}' + - POSTGRES_DB=${LOBE_DB_NAME} + - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} healthcheck: - test: ['CMD-SHELL', 'pg_isready -U postgres'] + test: + - CMD-SHELL + - pg_isready -U postgres interval: 5s timeout: 5s retries: 5 restart: always networks: - lobe-network - minio: image: minio/minio container_name: lobe-minio - network_mode: 'service:network-service' + network_mode: service:network-service volumes: - - './s3_data:/etc/minio/data' + - ./s3_data:/etc/minio/data - ./minio-entrypoint.sh:/entrypoint.sh environment: - - 'MINIO_API_CORS_ALLOW_ORIGIN=*' + - MINIO_API_CORS_ALLOW_ORIGIN=* env_file: - .env restart: always - entrypoint: ["sh", "/entrypoint.sh"] - + entrypoint: + - sh + - /entrypoint.sh casdoor: - image: casbin/casdoor:v1.843.0 + image: casbin/casdoor:v1.970.0 container_name: lobe-casdoor entrypoint: /bin/sh -c './server --createDatabase=true' - network_mode: 'service:network-service' + network_mode: service:network-service depends_on: postgresql: condition: service_healthy environment: httpport: ${CASDOOR_PORT} RUNNING_IN_DOCKER: 'true' - driverName: 'postgres' - dataSourceName: 'user=postgres password=${POSTGRES_PASSWORD} host=postgresql port=5432 sslmode=disable dbname=casdoor' - runmode: 'dev' + driverName: postgres + dataSourceName: user=postgres password=${POSTGRES_PASSWORD} host=postgresql + port=5432 sslmode=disable dbname=casdoor + runmode: dev volumes: - ./init_data.json:/init_data.json env_file: - .env - searxng: image: searxng/searxng container_name: lobe-searxng volumes: - - './searxng-settings.yml:/etc/searxng/settings.yml' + - ./searxng-settings.yml:/etc/searxng/settings.yml environment: - - 'SEARXNG_SETTINGS_FILE=/etc/searxng/settings.yml' + - SEARXNG_SETTINGS_FILE=/etc/searxng/settings.yml restart: always networks: - lobe-network env_file: - .env - lobe: image: lobehub/lobe-chat-database:1.77.16 container_name: lobe-chat - network_mode: 'service:network-service' + network_mode: service:network-service depends_on: postgresql: condition: service_healthy @@ -90,33 +90,32 @@ services: condition: service_started casdoor: condition: service_started - environment: - - 'NEXT_AUTH_SSO_PROVIDERS=casdoor' - - 'KEY_VAULTS_SECRET=Kix2wcUONd4CX51E/ZPAd36BqM4wzJgKjPtz2sGztqQ=' - - 'NEXT_AUTH_SECRET=NX2kaPE923dt6BL2U8e9oSre5RfoT7hg' - - 'DATABASE_URL=postgresql://postgres:${POSTGRES_PASSWORD}@postgresql:5432/${LOBE_DB_NAME}' - - 'S3_BUCKET=${MINIO_LOBE_BUCKET}' - - 'S3_ENABLE_PATH_STYLE=1' - - 'S3_ACCESS_KEY=${MINIO_ROOT_USER}' - - 'S3_ACCESS_KEY_ID=${MINIO_ROOT_USER}' - - 'S3_SECRET_ACCESS_KEY=${MINIO_ROOT_PASSWORD}' - - 'LLM_VISION_IMAGE_USE_BASE64=1' - - 'S3_SET_ACL=0' - - 'SEARXNG_URL=http://searxng:8080' + - NEXT_AUTH_SSO_PROVIDERS=casdoor + - KEY_VAULTS_SECRET=Kix2wcUONd4CX51E/ZPAd36BqM4wzJgKjPtz2sGztqQ= + - NEXT_AUTH_SECRET=NX2kaPE923dt6BL2U8e9oSre5RfoT7hg + - DATABASE_URL=postgresql://postgres:${POSTGRES_PASSWORD}@postgresql:5432/${LOBE_DB_NAME} + - S3_BUCKET=${MINIO_LOBE_BUCKET} + - S3_ENABLE_PATH_STYLE=1 + - S3_ACCESS_KEY=${MINIO_ROOT_USER} + - S3_ACCESS_KEY_ID=${MINIO_ROOT_USER} + - S3_SECRET_ACCESS_KEY=${MINIO_ROOT_PASSWORD} + - LLM_VISION_IMAGE_USE_BASE64=1 + - S3_SET_ACL=0 + - SEARXNG_URL=http://searxng:8080 env_file: - .env restart: always volumes: - ./lobe-entrypoint.sh:/entrypoint.sh - entrypoint: ["sh", "/entrypoint.sh"] - + entrypoint: + - sh + - /entrypoint.sh volumes: data: driver: local s3_data: driver: local - networks: lobe-network: driver: bridge diff --git a/apps/lobe-chat-data/1.77.16/init_data.json b/apps/lobe-chat-data/v1.970.0/init_data.json similarity index 100% rename from apps/lobe-chat-data/1.77.16/init_data.json rename to apps/lobe-chat-data/v1.970.0/init_data.json diff --git a/apps/lobe-chat-data/1.77.16/lobe-entrypoint.sh b/apps/lobe-chat-data/v1.970.0/lobe-entrypoint.sh similarity index 100% rename from apps/lobe-chat-data/1.77.16/lobe-entrypoint.sh rename to apps/lobe-chat-data/v1.970.0/lobe-entrypoint.sh diff --git a/apps/lobe-chat-data/1.77.16/minio-entrypoint.sh b/apps/lobe-chat-data/v1.970.0/minio-entrypoint.sh similarity index 100% rename from apps/lobe-chat-data/1.77.16/minio-entrypoint.sh rename to apps/lobe-chat-data/v1.970.0/minio-entrypoint.sh diff --git a/apps/lobe-chat-data/1.77.16/searxng-settings.yml b/apps/lobe-chat-data/v1.970.0/searxng-settings.yml similarity index 100% rename from apps/lobe-chat-data/1.77.16/searxng-settings.yml rename to apps/lobe-chat-data/v1.970.0/searxng-settings.yml