mirror of
https://git.mirrors.martin98.com/https://github.com/langgenius/dify.git
synced 2025-08-18 05:25:54 +08:00
chore: fix action error
This commit is contained in:
parent
ca34a1e01a
commit
ae62d089db
@ -41,6 +41,7 @@ googleapis-common-protos = "1.63.0"
|
|||||||
gunicorn = "~23.0.0"
|
gunicorn = "~23.0.0"
|
||||||
httpx = { version = "~0.27.0", extras = ["socks"] }
|
httpx = { version = "~0.27.0", extras = ["socks"] }
|
||||||
jieba = "0.42.1"
|
jieba = "0.42.1"
|
||||||
|
json-repair = "~0.40.0"
|
||||||
langfuse = "~2.51.3"
|
langfuse = "~2.51.3"
|
||||||
langsmith = "~0.1.77"
|
langsmith = "~0.1.77"
|
||||||
mailchimp-transactional = "~1.0.50"
|
mailchimp-transactional = "~1.0.50"
|
||||||
@ -94,7 +95,6 @@ yarl = "~1.18.3"
|
|||||||
# Related transparent dependencies with pinned version
|
# Related transparent dependencies with pinned version
|
||||||
# required by main implementations
|
# required by main implementations
|
||||||
############################################################
|
############################################################
|
||||||
json-repair = "~0.40.0"
|
|
||||||
[tool.poetry.group.indirect.dependencies]
|
[tool.poetry.group.indirect.dependencies]
|
||||||
kaleido = "0.2.1"
|
kaleido = "0.2.1"
|
||||||
rank-bm25 = "~0.2.2"
|
rank-bm25 = "~0.2.2"
|
||||||
|
@ -548,7 +548,7 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- ./volumes/db/data:/var/lib/postgresql/data
|
- ./volumes/db/data:/var/lib/postgresql/data
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "pg_isready"]
|
test: [ 'CMD', 'pg_isready' ]
|
||||||
interval: 1s
|
interval: 1s
|
||||||
timeout: 3s
|
timeout: 3s
|
||||||
retries: 30
|
retries: 30
|
||||||
@ -565,7 +565,7 @@ services:
|
|||||||
# Set the redis password when startup redis server.
|
# Set the redis password when startup redis server.
|
||||||
command: redis-server --requirepass ${REDIS_PASSWORD:-difyai123456}
|
command: redis-server --requirepass ${REDIS_PASSWORD:-difyai123456}
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "redis-cli", "ping"]
|
test: [ 'CMD', 'redis-cli', 'ping' ]
|
||||||
|
|
||||||
# The DifySandbox
|
# The DifySandbox
|
||||||
sandbox:
|
sandbox:
|
||||||
@ -586,7 +586,7 @@ services:
|
|||||||
- ./volumes/sandbox/dependencies:/dependencies
|
- ./volumes/sandbox/dependencies:/dependencies
|
||||||
- ./volumes/sandbox/conf:/conf
|
- ./volumes/sandbox/conf:/conf
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "curl", "-f", "http://localhost:8194/health"]
|
test: [ 'CMD', 'curl', '-f', 'http://localhost:8194/health' ]
|
||||||
networks:
|
networks:
|
||||||
- ssrf_proxy_network
|
- ssrf_proxy_network
|
||||||
|
|
||||||
@ -644,12 +644,7 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- ./ssrf_proxy/squid.conf.template:/etc/squid/squid.conf.template
|
- ./ssrf_proxy/squid.conf.template:/etc/squid/squid.conf.template
|
||||||
- ./ssrf_proxy/docker-entrypoint.sh:/docker-entrypoint-mount.sh
|
- ./ssrf_proxy/docker-entrypoint.sh:/docker-entrypoint-mount.sh
|
||||||
entrypoint:
|
entrypoint: [ 'sh', '-c', "cp /docker-entrypoint-mount.sh /docker-entrypoint.sh && sed -i 's/\r$$//' /docker-entrypoint.sh && chmod +x /docker-entrypoint.sh && /docker-entrypoint.sh" ]
|
||||||
[
|
|
||||||
"sh",
|
|
||||||
"-c",
|
|
||||||
"cp /docker-entrypoint-mount.sh /docker-entrypoint.sh && sed -i 's/\r$$//' /docker-entrypoint.sh && chmod +x /docker-entrypoint.sh && /docker-entrypoint.sh",
|
|
||||||
]
|
|
||||||
environment:
|
environment:
|
||||||
# pls clearly modify the squid env vars to fit your network environment.
|
# pls clearly modify the squid env vars to fit your network environment.
|
||||||
HTTP_PORT: ${SSRF_HTTP_PORT:-3128}
|
HTTP_PORT: ${SSRF_HTTP_PORT:-3128}
|
||||||
@ -678,8 +673,8 @@ services:
|
|||||||
- CERTBOT_EMAIL=${CERTBOT_EMAIL}
|
- CERTBOT_EMAIL=${CERTBOT_EMAIL}
|
||||||
- CERTBOT_DOMAIN=${CERTBOT_DOMAIN}
|
- CERTBOT_DOMAIN=${CERTBOT_DOMAIN}
|
||||||
- CERTBOT_OPTIONS=${CERTBOT_OPTIONS:-}
|
- CERTBOT_OPTIONS=${CERTBOT_OPTIONS:-}
|
||||||
entrypoint: ["/docker-entrypoint.sh"]
|
entrypoint: [ '/docker-entrypoint.sh' ]
|
||||||
command: ["tail", "-f", "/dev/null"]
|
command: [ 'tail', '-f', '/dev/null' ]
|
||||||
|
|
||||||
# The nginx reverse proxy.
|
# The nginx reverse proxy.
|
||||||
# used for reverse proxying the API service and Web service.
|
# used for reverse proxying the API service and Web service.
|
||||||
@ -696,12 +691,7 @@ services:
|
|||||||
- ./volumes/certbot/conf/live:/etc/letsencrypt/live # cert dir (with certbot container)
|
- ./volumes/certbot/conf/live:/etc/letsencrypt/live # cert dir (with certbot container)
|
||||||
- ./volumes/certbot/conf:/etc/letsencrypt
|
- ./volumes/certbot/conf:/etc/letsencrypt
|
||||||
- ./volumes/certbot/www:/var/www/html
|
- ./volumes/certbot/www:/var/www/html
|
||||||
entrypoint:
|
entrypoint: [ 'sh', '-c', "cp /docker-entrypoint-mount.sh /docker-entrypoint.sh && sed -i 's/\r$$//' /docker-entrypoint.sh && chmod +x /docker-entrypoint.sh && /docker-entrypoint.sh" ]
|
||||||
[
|
|
||||||
"sh",
|
|
||||||
"-c",
|
|
||||||
"cp /docker-entrypoint-mount.sh /docker-entrypoint.sh && sed -i 's/\r$$//' /docker-entrypoint.sh && chmod +x /docker-entrypoint.sh && /docker-entrypoint.sh",
|
|
||||||
]
|
|
||||||
environment:
|
environment:
|
||||||
NGINX_SERVER_NAME: ${NGINX_SERVER_NAME:-_}
|
NGINX_SERVER_NAME: ${NGINX_SERVER_NAME:-_}
|
||||||
NGINX_HTTPS_ENABLED: ${NGINX_HTTPS_ENABLED:-false}
|
NGINX_HTTPS_ENABLED: ${NGINX_HTTPS_ENABLED:-false}
|
||||||
@ -723,14 +713,14 @@ services:
|
|||||||
- api
|
- api
|
||||||
- web
|
- web
|
||||||
ports:
|
ports:
|
||||||
- "${EXPOSE_NGINX_PORT:-80}:${NGINX_PORT:-80}"
|
- '${EXPOSE_NGINX_PORT:-80}:${NGINX_PORT:-80}'
|
||||||
- "${EXPOSE_NGINX_SSL_PORT:-443}:${NGINX_SSL_PORT:-443}"
|
- '${EXPOSE_NGINX_SSL_PORT:-443}:${NGINX_SSL_PORT:-443}'
|
||||||
|
|
||||||
# The Weaviate vector store.
|
# The Weaviate vector store.
|
||||||
weaviate:
|
weaviate:
|
||||||
image: semitechnologies/weaviate:1.19.0
|
image: semitechnologies/weaviate:1.19.0
|
||||||
profiles:
|
profiles:
|
||||||
- ""
|
- ''
|
||||||
- weaviate
|
- weaviate
|
||||||
restart: always
|
restart: always
|
||||||
volumes:
|
volumes:
|
||||||
@ -783,17 +773,13 @@ services:
|
|||||||
working_dir: /opt/couchbase
|
working_dir: /opt/couchbase
|
||||||
stdin_open: true
|
stdin_open: true
|
||||||
tty: true
|
tty: true
|
||||||
entrypoint: [""]
|
entrypoint: [ "" ]
|
||||||
command: sh -c "/opt/couchbase/init/init-cbserver.sh"
|
command: sh -c "/opt/couchbase/init/init-cbserver.sh"
|
||||||
volumes:
|
volumes:
|
||||||
- ./volumes/couchbase/data:/opt/couchbase/var/lib/couchbase/data
|
- ./volumes/couchbase/data:/opt/couchbase/var/lib/couchbase/data
|
||||||
healthcheck:
|
healthcheck:
|
||||||
# ensure bucket was created before proceeding
|
# ensure bucket was created before proceeding
|
||||||
test:
|
test: [ "CMD-SHELL", "curl -s -f -u Administrator:password http://localhost:8091/pools/default/buckets | grep -q '\\[{' || exit 1" ]
|
||||||
[
|
|
||||||
"CMD-SHELL",
|
|
||||||
"curl -s -f -u Administrator:password http://localhost:8091/pools/default/buckets | grep -q '\\[{' || exit 1",
|
|
||||||
]
|
|
||||||
interval: 10s
|
interval: 10s
|
||||||
retries: 10
|
retries: 10
|
||||||
start_period: 30s
|
start_period: 30s
|
||||||
@ -819,9 +805,9 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- ./volumes/pgvector/data:/var/lib/postgresql/data
|
- ./volumes/pgvector/data:/var/lib/postgresql/data
|
||||||
- ./pgvector/docker-entrypoint.sh:/docker-entrypoint.sh
|
- ./pgvector/docker-entrypoint.sh:/docker-entrypoint.sh
|
||||||
entrypoint: ["/docker-entrypoint.sh"]
|
entrypoint: [ '/docker-entrypoint.sh' ]
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "pg_isready"]
|
test: [ 'CMD', 'pg_isready' ]
|
||||||
interval: 1s
|
interval: 1s
|
||||||
timeout: 3s
|
timeout: 3s
|
||||||
retries: 30
|
retries: 30
|
||||||
@ -843,7 +829,7 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- ./volumes/pgvecto_rs/data:/var/lib/postgresql/data
|
- ./volumes/pgvecto_rs/data:/var/lib/postgresql/data
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "pg_isready"]
|
test: [ 'CMD', 'pg_isready' ]
|
||||||
interval: 1s
|
interval: 1s
|
||||||
timeout: 3s
|
timeout: 3s
|
||||||
retries: 30
|
retries: 30
|
||||||
@ -911,7 +897,7 @@ services:
|
|||||||
- ./volumes/milvus/etcd:/etcd
|
- ./volumes/milvus/etcd:/etcd
|
||||||
command: etcd -advertise-client-urls=http://127.0.0.1:2379 -listen-client-urls http://0.0.0.0:2379 --data-dir /etcd
|
command: etcd -advertise-client-urls=http://127.0.0.1:2379 -listen-client-urls http://0.0.0.0:2379 --data-dir /etcd
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "etcdctl", "endpoint", "health"]
|
test: [ 'CMD', 'etcdctl', 'endpoint', 'health' ]
|
||||||
interval: 30s
|
interval: 30s
|
||||||
timeout: 20s
|
timeout: 20s
|
||||||
retries: 3
|
retries: 3
|
||||||
@ -930,7 +916,7 @@ services:
|
|||||||
- ./volumes/milvus/minio:/minio_data
|
- ./volumes/milvus/minio:/minio_data
|
||||||
command: minio server /minio_data --console-address ":9001"
|
command: minio server /minio_data --console-address ":9001"
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"]
|
test: [ 'CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live' ]
|
||||||
interval: 30s
|
interval: 30s
|
||||||
timeout: 20s
|
timeout: 20s
|
||||||
retries: 3
|
retries: 3
|
||||||
@ -942,7 +928,7 @@ services:
|
|||||||
image: milvusdb/milvus:v2.5.0-beta
|
image: milvusdb/milvus:v2.5.0-beta
|
||||||
profiles:
|
profiles:
|
||||||
- milvus
|
- milvus
|
||||||
command: ["milvus", "run", "standalone"]
|
command: [ 'milvus', 'run', 'standalone' ]
|
||||||
environment:
|
environment:
|
||||||
ETCD_ENDPOINTS: ${ETCD_ENDPOINTS:-etcd:2379}
|
ETCD_ENDPOINTS: ${ETCD_ENDPOINTS:-etcd:2379}
|
||||||
MINIO_ADDRESS: ${MINIO_ADDRESS:-minio:9000}
|
MINIO_ADDRESS: ${MINIO_ADDRESS:-minio:9000}
|
||||||
@ -950,7 +936,7 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- ./volumes/milvus/milvus:/var/lib/milvus
|
- ./volumes/milvus/milvus:/var/lib/milvus
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "curl", "-f", "http://localhost:9091/healthz"]
|
test: [ 'CMD', 'curl', '-f', 'http://localhost:9091/healthz' ]
|
||||||
interval: 30s
|
interval: 30s
|
||||||
start_period: 90s
|
start_period: 90s
|
||||||
timeout: 20s
|
timeout: 20s
|
||||||
@ -1057,19 +1043,18 @@ services:
|
|||||||
node.name: dify-es0
|
node.name: dify-es0
|
||||||
discovery.type: single-node
|
discovery.type: single-node
|
||||||
xpack.license.self_generated.type: basic
|
xpack.license.self_generated.type: basic
|
||||||
xpack.security.enabled: "true"
|
xpack.security.enabled: 'true'
|
||||||
xpack.security.enrollment.enabled: "false"
|
xpack.security.enrollment.enabled: 'false'
|
||||||
xpack.security.http.ssl.enabled: "false"
|
xpack.security.http.ssl.enabled: 'false'
|
||||||
ports:
|
ports:
|
||||||
- ${ELASTICSEARCH_PORT:-9200}:9200
|
- ${ELASTICSEARCH_PORT:-9200}:9200
|
||||||
deploy:
|
deploy:
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
memory: 2g
|
memory: 2g
|
||||||
entrypoint: ["sh", "-c", "sh /docker-entrypoint-mount.sh"]
|
entrypoint: [ 'sh', '-c', "sh /docker-entrypoint-mount.sh" ]
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test:
|
test: [ 'CMD', 'curl', '-s', 'http://localhost:9200/_cluster/health?pretty' ]
|
||||||
["CMD", "curl", "-s", "http://localhost:9200/_cluster/health?pretty"]
|
|
||||||
interval: 30s
|
interval: 30s
|
||||||
timeout: 10s
|
timeout: 10s
|
||||||
retries: 50
|
retries: 50
|
||||||
@ -1087,17 +1072,17 @@ services:
|
|||||||
environment:
|
environment:
|
||||||
XPACK_ENCRYPTEDSAVEDOBJECTS_ENCRYPTIONKEY: d1a66dfd-c4d3-4a0a-8290-2abcb83ab3aa
|
XPACK_ENCRYPTEDSAVEDOBJECTS_ENCRYPTIONKEY: d1a66dfd-c4d3-4a0a-8290-2abcb83ab3aa
|
||||||
NO_PROXY: localhost,127.0.0.1,elasticsearch,kibana
|
NO_PROXY: localhost,127.0.0.1,elasticsearch,kibana
|
||||||
XPACK_SECURITY_ENABLED: "true"
|
XPACK_SECURITY_ENABLED: 'true'
|
||||||
XPACK_SECURITY_ENROLLMENT_ENABLED: "false"
|
XPACK_SECURITY_ENROLLMENT_ENABLED: 'false'
|
||||||
XPACK_SECURITY_HTTP_SSL_ENABLED: "false"
|
XPACK_SECURITY_HTTP_SSL_ENABLED: 'false'
|
||||||
XPACK_FLEET_ISAIRGAPPED: "true"
|
XPACK_FLEET_ISAIRGAPPED: 'true'
|
||||||
I18N_LOCALE: zh-CN
|
I18N_LOCALE: zh-CN
|
||||||
SERVER_PORT: "5601"
|
SERVER_PORT: '5601'
|
||||||
ELASTICSEARCH_HOSTS: http://elasticsearch:9200
|
ELASTICSEARCH_HOSTS: http://elasticsearch:9200
|
||||||
ports:
|
ports:
|
||||||
- ${KIBANA_PORT:-5601}:5601
|
- ${KIBANA_PORT:-5601}:5601
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD-SHELL", "curl -s http://localhost:5601 >/dev/null || exit 1"]
|
test: [ 'CMD-SHELL', 'curl -s http://localhost:5601 >/dev/null || exit 1' ]
|
||||||
interval: 30s
|
interval: 30s
|
||||||
timeout: 10s
|
timeout: 10s
|
||||||
retries: 3
|
retries: 3
|
||||||
|
Loading…
x
Reference in New Issue
Block a user