Skip to content

Commit a27462d

Browse files
authored
Chore/improve docker compose (langgenius#5784)
1 parent 91da622 commit a27462d

File tree

6 files changed

+55
-148
lines changed

6 files changed

+55
-148
lines changed

docker/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

docker/docker-compose.middleware.yaml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ services:
3434
# The DifySandbox configurations
3535
# Make sure you are changing this key for your deployment with a strong key.
3636
# You can generate a strong key using `openssl rand -base64 42`.
37-
API_KEY: ${API_KEY:-dify-sandbox}
38-
GIN_MODE: ${GIN_MODE:-release}
39-
WORKER_TIMEOUT: ${WORKER_TIMEOUT:-15}
40-
ENABLE_NETWORK: ${ENABLE_NETWORK:-true}
41-
HTTP_PROXY: ${HTTP_PROXY:-http://ssrf_proxy:3128}
42-
HTTPS_PROXY: ${HTTPS_PROXY:-http://ssrf_proxy:3128}
37+
API_KEY: ${SANDBOX_API_KEY:-dify-sandbox}
38+
GIN_MODE: ${SANDBOX_GIN_MODE:-release}
39+
WORKER_TIMEOUT: ${SANDBOX_WORKER_TIMEOUT:-15}
40+
ENABLE_NETWORK: ${SANDBOX_ENABLE_NETWORK:-true}
41+
HTTP_PROXY: ${SANDBOX_HTTP_PROXY:-http://ssrf_proxy:3128}
42+
HTTPS_PROXY: ${SANDBOX_HTTPS_PROXY:-http://ssrf_proxy:3128}
4343
SANDBOX_PORT: ${SANDBOX_PORT:-8194}
4444
volumes:
4545
- ./volumes/sandbox/dependencies:/dependencies
@@ -54,14 +54,14 @@ services:
5454
restart: always
5555
volumes:
5656
- ./ssrf_proxy/squid.conf.template:/etc/squid/squid.conf.template
57-
- ./ssrf_proxy/docker-entrypoint.sh:/docker-entrypoint.sh
58-
entrypoint: /docker-entrypoint.sh
57+
- ./ssrf_proxy/docker-entrypoint.sh:/docker-entrypoint-mount.sh
58+
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" ]
5959
environment:
6060
# pls clearly modify the squid env vars to fit your network environment.
6161
HTTP_PORT: ${SSRF_HTTP_PORT:-3128}
62-
COREDUMP_DIR: ${COREDUMP_DIR:-/var/spool/squid}
63-
REVERSE_PROXY_PORT: ${REVERSE_PROXY_PORT:-8194}
64-
SANDBOX_HOST: ${SANDBOX_HOST:-sandbox}
62+
COREDUMP_DIR: ${SSRF_COREDUMP_DIR:-/var/spool/squid}
63+
REVERSE_PROXY_PORT: ${SSRF_REVERSE_PROXY_PORT:-8194}
64+
SANDBOX_HOST: ${SSRF_SANDBOX_HOST:-sandbox}
6565
SANDBOX_PORT: ${SANDBOX_PORT:-8194}
6666
ports:
6767
- "${EXPOSE_SSRF_PROXY_PORT:-3128}:${SSRF_HTTP_PORT:-3128}"
@@ -84,16 +84,16 @@ services:
8484
environment:
8585
# The Weaviate configurations
8686
# You can refer to the [Weaviate](https://weaviate.io/developers/weaviate/config-refs/env-vars) documentation for more information.
87-
PERSISTENCE_DATA_PATH: ${PERSISTENCE_DATA_PATH:-'/var/lib/weaviate'}
88-
QUERY_DEFAULTS_LIMIT: ${QUERY_DEFAULTS_LIMIT:-25}
89-
AUTHENTICATION_ANONYMOUS_ACCESS_ENABLED: ${AUTHENTICATION_ANONYMOUS_ACCESS_ENABLED:-false}
90-
DEFAULT_VECTORIZER_MODULE: ${DEFAULT_VECTORIZER_MODULE:-none}
91-
CLUSTER_HOSTNAME: ${CLUSTER_HOSTNAME:-node1}
92-
AUTHENTICATION_APIKEY_ENABLED: ${AUTHENTICATION_APIKEY_ENABLED:-true}
93-
AUTHENTICATION_APIKEY_ALLOWED_KEYS: ${AUTHENTICATION_APIKEY_ALLOWED_KEYS:-WVF5YThaHlkYwhGUSmCRgsX3tD5ngdN8pkih}
94-
AUTHENTICATION_APIKEY_USERS: ${AUTHENTICATION_APIKEY_USERS:[email protected]}
95-
AUTHORIZATION_ADMINLIST_ENABLED: ${AUTHORIZATION_ADMINLIST_ENABLED:-true}
96-
AUTHORIZATION_ADMINLIST_USERS: ${AUTHORIZATION_ADMINLIST_USERS:[email protected]}
87+
PERSISTENCE_DATA_PATH: ${WEAVIATE_PERSISTENCE_DATA_PATH:-/var/lib/weaviate}
88+
QUERY_DEFAULTS_LIMIT: ${WEAVIATE_QUERY_DEFAULTS_LIMIT:-25}
89+
AUTHENTICATION_ANONYMOUS_ACCESS_ENABLED: ${WEAVIATE_AUTHENTICATION_ANONYMOUS_ACCESS_ENABLED:-false}
90+
DEFAULT_VECTORIZER_MODULE: ${WEAVIATE_DEFAULT_VECTORIZER_MODULE:-none}
91+
CLUSTER_HOSTNAME: ${WEAVIATE_CLUSTER_HOSTNAME:-node1}
92+
AUTHENTICATION_APIKEY_ENABLED: ${WEAVIATE_AUTHENTICATION_APIKEY_ENABLED:-true}
93+
AUTHENTICATION_APIKEY_ALLOWED_KEYS: ${WEAVIATE_AUTHENTICATION_APIKEY_ALLOWED_KEYS:-WVF5YThaHlkYwhGUSmCRgsX3tD5ngdN8pkih}
94+
AUTHENTICATION_APIKEY_USERS: ${WEAVIATE_AUTHENTICATION_APIKEY_USERS:[email protected]}
95+
AUTHORIZATION_ADMINLIST_ENABLED: ${WEAVIATE_AUTHORIZATION_ADMINLIST_ENABLED:-true}
96+
AUTHORIZATION_ADMINLIST_USERS: ${WEAVIATE_AUTHORIZATION_ADMINLIST_USERS:[email protected]}
9797
ports:
9898
- "${EXPOSE_WEAVIATE_PORT:-8080}:8080"
9999

0 commit comments

Comments
 (0)