diff --git a/xin-dify/docker-compose.yml b/xin-dify/docker-compose.yml index 1542957..ab90f0a 100644 --- a/xin-dify/docker-compose.yml +++ b/xin-dify/docker-compose.yml @@ -489,7 +489,7 @@ services: - redis volumes: # Mount the storage directory to the container, for storing user files. - - ${APP_DATA_DIR}/volumes/app/storage:/app/api/storage + - ${APP_DATA_DIR}/data/volumes/app/storage:/app/api/storage networks: - ssrf_proxy_network - default @@ -514,7 +514,7 @@ services: - redis volumes: # Mount the storage directory to the container, for storing user files. - - ${APP_DATA_DIR}/volumes/app/storage:/app/api/storage + - ${APP_DATA_DIR}/data/volumes/app/storage:/app/api/storage networks: - ssrf_proxy_network - default @@ -556,7 +556,7 @@ services: -c 'maintenance_work_mem=${POSTGRES_MAINTENANCE_WORK_MEM:-64MB}' -c 'effective_cache_size=${POSTGRES_EFFECTIVE_CACHE_SIZE:-4096MB}' volumes: - - ${APP_DATA_DIR}/volumes/db/data:/var/lib/postgresql/data + - ${APP_DATA_DIR}/data/volumes/db/data:/var/lib/postgresql/data healthcheck: test: [ 'CMD', 'pg_isready', '-h', 'db', '-U', '${PGUSER:-postgres}', '-d', '${POSTGRES_DB:-dify}' ] interval: 1s @@ -571,7 +571,7 @@ services: REDISCLI_AUTH: ${REDIS_PASSWORD:-difyai123456} volumes: # Mount the redis data directory to the container. - - ${APP_DATA_DIR}/volumes/redis/data:/data + - ${APP_DATA_DIR}/data/volumes/redis/data:/data # Set the redis password when startup redis server. command: redis-server --requirepass ${REDIS_PASSWORD:-difyai123456} healthcheck: @@ -593,8 +593,8 @@ services: HTTPS_PROXY: ${SANDBOX_HTTPS_PROXY:-http://ssrf_proxy:3128} SANDBOX_PORT: ${SANDBOX_PORT:-8194} volumes: - - ${APP_DATA_DIR}/volumes/sandbox/dependencies:/dependencies - - ${APP_DATA_DIR}/volumes/sandbox/conf:/conf + - ${APP_DATA_DIR}/data/volumes/sandbox/dependencies:/dependencies + - ${APP_DATA_DIR}/data/volumes/sandbox/conf:/conf healthcheck: test: [ 'CMD', 'curl', '-f', 'http://localhost:8194/health' ] networks: @@ -641,7 +641,7 @@ services: ports: - "${EXPOSE_PLUGIN_DEBUGGING_PORT:-5003}:${PLUGIN_DEBUGGING_PORT:-5003}" volumes: - - ${APP_DATA_DIR}/volumes/plugin_daemon:/app/storage + - ${APP_DATA_DIR}/data/volumes/plugin_daemon:/app/storage depends_on: db: condition: service_healthy @@ -653,8 +653,8 @@ services: image: ubuntu/squid:latest restart: always volumes: - - ${APP_DATA_DIR}/ssrf_proxy/squid.conf.template:/etc/squid/squid.conf.template - - ${APP_DATA_DIR}/ssrf_proxy/docker-entrypoint.sh:/docker-entrypoint-mount.sh + - ${APP_DATA_DIR}/data/ssrf_proxy/squid.conf.template:/etc/squid/squid.conf.template + - ${APP_DATA_DIR}/data/ssrf_proxy/docker-entrypoint.sh:/docker-entrypoint-mount.sh 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" ] environment: # pls clearly modify the squid env vars to fit your network environment. @@ -674,12 +674,12 @@ services: profiles: - certbot volumes: - - ${APP_DATA_DIR}/volumes/certbot/conf:/etc/letsencrypt - - ${APP_DATA_DIR}/volumes/certbot/www:/var/www/html - - ${APP_DATA_DIR}/volumes/certbot/logs:/var/log/letsencrypt - - ${APP_DATA_DIR}/volumes/certbot/conf/live:/etc/letsencrypt/live - - ${APP_DATA_DIR}/certbot/update-cert.template.txt:/update-cert.template.txt - - ${APP_DATA_DIR}/certbot/docker-entrypoint.sh:/docker-entrypoint.sh + - ${APP_DATA_DIR}/data/volumes/certbot/conf:/etc/letsencrypt + - ${APP_DATA_DIR}/data/volumes/certbot/www:/var/www/html + - ${APP_DATA_DIR}/data/volumes/certbot/logs:/var/log/letsencrypt + - ${APP_DATA_DIR}/data/volumes/certbot/conf/live:/etc/letsencrypt/live + - ${APP_DATA_DIR}/data/certbot/update-cert.template.txt:/update-cert.template.txt + - ${APP_DATA_DIR}/data/certbot/docker-entrypoint.sh:/docker-entrypoint.sh environment: - CERTBOT_EMAIL=${CERTBOT_EMAIL} - CERTBOT_DOMAIN=${CERTBOT_DOMAIN} @@ -693,15 +693,15 @@ services: image: nginx:latest restart: always volumes: - - ${APP_DATA_DIR}/nginx/nginx.conf.template:/etc/nginx/nginx.conf.template - - ${APP_DATA_DIR}/nginx/proxy.conf.template:/etc/nginx/proxy.conf.template - - ${APP_DATA_DIR}/nginx/https.conf.template:/etc/nginx/https.conf.template - - ${APP_DATA_DIR}/nginx/conf.d:/etc/nginx/conf.d - - ${APP_DATA_DIR}/nginx/docker-entrypoint.sh:/docker-entrypoint-mount.sh - - ${APP_DATA_DIR}/nginx/ssl:/etc/ssl # cert dir (legacy) - - ${APP_DATA_DIR}/volumes/certbot/conf/live:/etc/letsencrypt/live # cert dir (with certbot container) - - ${APP_DATA_DIR}/volumes/certbot/conf:/etc/letsencrypt - - ${APP_DATA_DIR}/volumes/certbot/www:/var/www/html + - ${APP_DATA_DIR}/data/nginx/nginx.conf.template:/etc/nginx/nginx.conf.template + - ${APP_DATA_DIR}/data/nginx/proxy.conf.template:/etc/nginx/proxy.conf.template + - ${APP_DATA_DIR}/data/nginx/https.conf.template:/etc/nginx/https.conf.template + - ${APP_DATA_DIR}/data/nginx/conf.d:/etc/nginx/conf.d + - ${APP_DATA_DIR}/data/nginx/docker-entrypoint.sh:/docker-entrypoint-mount.sh + - ${APP_DATA_DIR}/data/nginx/ssl:/etc/ssl # cert dir (legacy) + - ${APP_DATA_DIR}/data/volumes/certbot/conf/live:/etc/letsencrypt/live # cert dir (with certbot container) + - ${APP_DATA_DIR}/data/volumes/certbot/conf:/etc/letsencrypt + - ${APP_DATA_DIR}/data/volumes/certbot/www:/var/www/html 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" ] environment: NGINX_SERVER_NAME: ${NGINX_SERVER_NAME:-_} @@ -736,7 +736,7 @@ services: restart: always volumes: # Mount the Weaviate data directory to the con tainer. - - ${APP_DATA_DIR}/volumes/weaviate:/var/lib/weaviate + - ${APP_DATA_DIR}/data/volumes/weaviate:/var/lib/weaviate environment: # The Weaviate configurations # You can refer to the [Weaviate](https://weaviate.io/developers/weaviate/config-refs/env-vars) documentation for more information. @@ -760,7 +760,7 @@ services: MINIO_ACCESS_KEY: ${MINIO_ACCESS_KEY:-minioadmin} MINIO_SECRET_KEY: ${MINIO_SECRET_KEY:-minioadmin} volumes: - - ${APP_DATA_DIR}/volumes/milvus/minio:/minio_data + - ${APP_DATA_DIR}/data/volumes/milvus/minio:/minio_data command: minio server /minio_data --console-address ":9001" healthcheck: test: [ 'CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live' ] @@ -781,7 +781,7 @@ services: MINIO_ADDRESS: ${MINIO_ADDRESS:-minio:9000} common.security.authorizationEnabled: ${MILVUS_AUTHORIZATION_ENABLED:-true} volumes: - - ${APP_DATA_DIR}/volumes/milvus/milvus:/var/lib/milvus + - ${APP_DATA_DIR}/data/volumes/milvus/milvus:/var/lib/milvus healthcheck: test: [ 'CMD', 'curl', '-f', 'http://localhost:9091/healthz' ] interval: 30s @@ -816,7 +816,7 @@ services: soft: ${OPENSEARCH_NOFILE_SOFT:-65536} hard: ${OPENSEARCH_NOFILE_HARD:-65536} volumes: - - ${APP_DATA_DIR}/volumes/opensearch/data:/usr/share/opensearch/data + - ${APP_DATA_DIR}/data/volumes/opensearch/data:/usr/share/opensearch/data networks: - opensearch-net @@ -828,7 +828,7 @@ services: environment: OPENSEARCH_HOSTS: '["https://opensearch:9200"]' volumes: - - ${APP_DATA_DIR}/volumes/opensearch/opensearch_dashboards.yml:/usr/share/opensearch-dashboards/config/opensearch_dashboards.yml + - ${APP_DATA_DIR}/data/volumes/opensearch/opensearch_dashboards.yml:/usr/share/opensearch-dashboards/config/opensearch_dashboards.yml networks: - opensearch-net depends_on: @@ -844,8 +844,8 @@ services: - elasticsearch-ja restart: always volumes: - - ${APP_DATA_DIR}/elasticsearch/docker-entrypoint.sh:/docker-entrypoint-mount.sh - - ${APP_DATA_DIR}/elasticsearch-data:/usr/share/elasticsearch/data + - ${APP_DATA_DIR}/data/elasticsearch/docker-entrypoint.sh:/docker-entrypoint-mount.sh + - ${APP_DATA_DIR}/data/elasticsearch-data:/usr/share/elasticsearch/data environment: ELASTIC_PASSWORD: ${ELASTICSEARCH_PASSWORD:-elastic} VECTOR_STORE: ${VECTOR_STORE:-} @@ -905,7 +905,7 @@ services: - unstructured restart: always volumes: - - ${APP_DATA_DIR}/volumes/unstructured:/app/data + - ${APP_DATA_DIR}/data/volumes/unstructured:/app/data networks: # create a network between sandbox, api and ssrf_proxy, and can not access outside.