diff --git a/.env.example b/.env.example index 8479073..ff72703 100644 --- a/.env.example +++ b/.env.example @@ -2,6 +2,16 @@ CLIPROXY_API_KEY=replace-with-the-key-from-cliproxyapi-config GEMINI_API_KEY=replace-with-your-gemini-api-key JUPYTER_TOKEN=replace-with-a-strong-random-token OPEN_TERMINAL_API_KEY=replace-with-a-strong-random-key +WEBUI_SECRET_KEY=replace-with-the-existing-open-webui-secret-key +STORAGE_PROVIDER=s3 +S3_ACCESS_KEY_ID=replace-with-an-oss-ram-access-key-id +S3_SECRET_ACCESS_KEY=replace-with-an-oss-ram-access-key-secret +S3_ENDPOINT_URL=https://oss-ap-southeast-1.aliyuncs.com +S3_REGION_NAME=ap-southeast-1 +S3_BUCKET_NAME=replace-with-your-oss-bucket-name +S3_ADDRESSING_STYLE=virtual +VECTOR_DB=pgvector +PGVECTOR_DB_URL=postgresql://openwebui:replace-with-url-encoded-password@rds-host:5432/openwebui?sslmode=require WEBUI_AUTH=true ENABLE_LOGIN_FORM=true @@ -13,4 +23,6 @@ GOOGLE_CLIENT_ID=replace-with-your-google-client-id GOOGLE_CLIENT_SECRET=replace-with-your-google-client-secret GOOGLE_REDIRECT_URI=http://localhost:3000/oauth/google/callback GOOGLE_OAUTH_SCOPE=openid email profile -OAUTH_ALLOWED_DOMAINS=example.com \ No newline at end of file +OAUTH_ALLOWED_DOMAINS=example.com + +DATABASE_URL=postgresql://openwebui:已URL编码的密码@你的RDS地址:5432/openwebui?sslmode=require \ No newline at end of file diff --git a/.gitignore b/.gitignore index c39fade..636cd76 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ cliproxyapi/config.yaml cliproxyapi/auths/ cliproxyapi/logs/ -litellm/gen-lang-client-*.json \ No newline at end of file +litellm/gen-lang-client-*.json +.firecrawl/* \ No newline at end of file diff --git a/docker-compose-online.yml b/docker-compose-online.yml index c0bfe46..710719b 100644 --- a/docker-compose-online.yml +++ b/docker-compose-online.yml @@ -6,12 +6,12 @@ services: container_name: cli-proxy-api pull_policy: always ports: - - '0.0.0.0:8317:8317' - - '0.0.0.0:8085:8085' - - '0.0.0.0:1455:1455' - - '0.0.0.0:54545:54545' - - '0.0.0.0:51121:51121' - - '0.0.0.0:11451:11451' + - '127.0.0.1:30010:8317' + - '127.0.0.1:30011:8085' + - '127.0.0.1:30012:1455' + - '127.0.0.1:30013:54545' + - '127.0.0.1:30014:51121' + - '127.0.0.1:30015:11451' volumes: - ./cliproxyapi/config.yaml:/CLIProxyAPI/config.yaml:ro - ./cliproxyapi/auths:/root/.cli-proxy-api @@ -21,9 +21,8 @@ services: image: docker.litellm.ai/berriai/litellm:main-stable container_name: litellm ports: - - '18003:4000' + - '127.0.0.1:30001:4000' environment: - - GEMINI_API_KEY=${GEMINI_API_KEY} - CLIPROXY_API_KEY=${CLIPROXY_API_KEY} volumes: - ./litellm:/app/litellm:ro @@ -41,7 +40,7 @@ services: container_name: docling-serve pull_policy: always ports: - - '127.0.0.1:18014:5001' + - '127.0.0.1:30002:5001' environment: - DOCLING_SERVE_ENABLE_UI=true - DOCLING_SERVE_MAX_SYNC_WAIT=600 @@ -83,7 +82,7 @@ services: container_name: open-webui pull_policy: always ports: - - '18004:8080' + - '127.0.0.1:30000:8080' environment: - OPENAI_API_BASE_URLS=http://litellm:4000/v1;http://cli-proxy-api:8317/v1 - OPENAI_API_KEYS=dummy;${CLIPROXY_API_KEY} @@ -91,6 +90,7 @@ services: TERMINAL_SERVER_CONNECTIONS=[{"id":"open-terminal","url":"http://open-terminal:8000","key":"${OPEN_TERMINAL_API_KEY}","name":"Open Terminal","auth_type":"bearer","config":{"access_grants":[]}}] - WEBUI_AUTH=true - WEBUI_NAME=棋洋 + - WEBUI_SECRET_KEY=${WEBUI_SECRET_KEY} - OAUTH_ALLOWED_DOMAINS=${OAUTH_ALLOWED_DOMAINS} - DEFAULT_USER_ROLE=pending - ENABLE_CODE_INTERPRETER=false @@ -115,6 +115,17 @@ services: - IMAGES_EDIT_OPENAI_API_BASE_URL=http://cli-proxy-api:8317/v1 - IMAGES_EDIT_OPENAI_API_KEY=${CLIPROXY_API_KEY} + - STORAGE_PROVIDER=${STORAGE_PROVIDER} + - S3_ACCESS_KEY_ID=${S3_ACCESS_KEY_ID} + - S3_SECRET_ACCESS_KEY=${S3_SECRET_ACCESS_KEY} + - S3_ENDPOINT_URL=${S3_ENDPOINT_URL} + - S3_REGION_NAME=${S3_REGION_NAME} + - S3_BUCKET_NAME=${S3_BUCKET_NAME} + - S3_ADDRESSING_STYLE=${S3_ADDRESSING_STYLE} + + - VECTOR_DB=${VECTOR_DB} + - PGVECTOR_DB_URL=${PGVECTOR_DB_URL} + - CONTENT_EXTRACTION_ENGINE=docling - DOCLING_SERVER_URL=http://docling-serve:5001 - >- @@ -126,6 +137,8 @@ services: - WHISPER_WEB_SEARCH_RESULT_COUNT=5 - WEB_SEARCH_TRUSTED_PROXY=true # ------------------------------------ + + - DATABASE_URL=${DATABASE_URL} volumes: - open-webui:/app/backend/data depends_on: