Add no_proxy env for micro services (#140)

Singed-off-by: Cao Huiyan <[email protected]> Signed-off-by: Zhou Ting <[email protected]> Co-authored-by: lvliang-intel <[email protected]>
opea-project · Jun 21, 2024 · df0c119 · df0c119
1 parent cef6eac
commit df0c119
Show file tree

Hide file tree

Showing 16 changed files with 18 additions and 2 deletions.
diff --git a/comps/dataprep/milvus/README.md b/comps/dataprep/milvus/README.md
@@ -15,6 +15,7 @@ Please refer to this [readme](../../../vectorstores/langchain/milvus/README.md).
 ## Setup Environment Variables
 
 ```bash
+export no_proxy=${your_no_proxy}
 export http_proxy=${your_http_proxy}
 export https_proxy=${your_http_proxy}
 export MILVUS=${your_milvus_host_ip}

diff --git a/comps/dataprep/qdrant/README.md b/comps/dataprep/qdrant/README.md
@@ -15,6 +15,7 @@ Please refer to this [readme](../../../vectorstores/langchain/qdrant/README.md).
 ## Setup Environment Variables
 
 ```bash
+export no_proxy=${your_no_proxy}
 export http_proxy=${your_http_proxy}
 export https_proxy=${your_http_proxy}
 export QDRANT=${host_ip}
@@ -48,6 +49,7 @@ docker run -d --name="dataprep-qdrant-server" -p 6000:6000 --ipc=host -e http_pr
 ## Setup Environment Variables
 
 ```bash
+export no_proxy=${your_no_proxy}
 export http_proxy=${your_http_proxy}
 export https_proxy=${your_http_proxy}
 export QDRANT=${host_ip}

diff --git a/comps/dataprep/qdrant/docker/docker-compose-dataprep-qdrant.yaml b/comps/dataprep/qdrant/docker/docker-compose-dataprep-qdrant.yaml
@@ -16,6 +16,7 @@ services:
       - "6000:6000"
     ipc: host
     environment:
+      no_proxy: ${no_proxy}
       http_proxy: ${http_proxy}
       https_proxy: ${https_proxy}
       QDRANT: ${QDRANT}

diff --git a/comps/dataprep/redis/langchain/docker/docker-compose-dataprep-redis.yaml b/comps/dataprep/redis/langchain/docker/docker-compose-dataprep-redis.yaml
@@ -16,6 +16,7 @@ services:
       - "6007:6007"
     ipc: host
     environment:
+      no_proxy: ${no_proxy}
       http_proxy: ${http_proxy}
       https_proxy: ${https_proxy}
       REDIS_URL: ${REDIS_URL}

diff --git a/comps/dataprep/redis/llama_index/docker/docker-compose-dataprep-redis.yaml b/comps/dataprep/redis/llama_index/docker/docker-compose-dataprep-redis.yaml
@@ -16,6 +16,7 @@ services:
       - "6007:6007"
     ipc: host
     environment:
+      no_proxy: ${no_proxy}
       http_proxy: ${http_proxy}
       https_proxy: ${https_proxy}
       REDIS_URL: ${REDIS_URL}

diff --git a/comps/embeddings/langchain/docker/docker_compose_embedding.yaml b/comps/embeddings/langchain/docker/docker_compose_embedding.yaml
@@ -11,6 +11,7 @@ services:
       - "6000:6000"
     ipc: host
     environment:
+      no_proxy: ${no_proxy}
       http_proxy: ${http_proxy}
       https_proxy: ${https_proxy}
       TEI_EMBEDDING_ENDPOINT: ${TEI_EMBEDDING_ENDPOINT}

diff --git a/comps/embeddings/llama_index/docker/docker_compose_embedding.yaml b/comps/embeddings/llama_index/docker/docker_compose_embedding.yaml
@@ -11,6 +11,7 @@ services:
       - "6000:6000"
     ipc: host
     environment:
+      no_proxy: ${no_proxy}
       http_proxy: ${http_proxy}
       https_proxy: ${https_proxy}
       TEI_EMBEDDING_ENDPOINT: ${TEI_EMBEDDING_ENDPOINT}

diff --git a/comps/guardrails/langchain/docker/docker_compose_guardrails.yaml b/comps/guardrails/langchain/docker/docker_compose_guardrails.yaml
@@ -22,6 +22,7 @@ services:
       - "9090:9090"
     ipc: host
     environment:
+      no_proxy: ${no_proxy}
       http_proxy: ${http_proxy}
       https_proxy: ${https_proxy}
       SAFETY_GUARD_ENDPOINT: ${SAFETY_GUARD_ENDPOINT}

diff --git a/comps/llms/summarization/tgi/docker_compose_llm.yaml b/comps/llms/summarization/tgi/docker_compose_llm.yaml
@@ -22,6 +22,7 @@ services:
       - "9000:9000"
     ipc: host
     environment:
+      no_proxy: ${no_proxy}
       http_proxy: ${http_proxy}
       https_proxy: ${https_proxy}
       TGI_LLM_ENDPOINT: ${TGI_LLM_ENDPOINT}

diff --git a/comps/llms/text-generation/ray_serve/docker_compose_llm.yaml b/comps/llms/text-generation/ray_serve/docker_compose_llm.yaml
@@ -41,6 +41,7 @@ services:
       - "9000:9000"
     ipc: host
     environment:
+      no_proxy: ${no_proxy}
       http_proxy: ${http_proxy}
       https_proxy: ${https_proxy}
       RAY_Serve_ENDPOINT: ${RAY_Serve_ENDPOINT}

diff --git a/comps/llms/text-generation/tgi/docker_compose_llm.yaml b/comps/llms/text-generation/tgi/docker_compose_llm.yaml
@@ -20,6 +20,7 @@ services:
       - "9000:9000"
     ipc: host
     environment:
+      no_proxy: ${no_proxy}
       http_proxy: ${http_proxy}
       https_proxy: ${https_proxy}
       TGI_LLM_ENDPOINT: ${TGI_LLM_ENDPOINT}

diff --git a/comps/llms/text-generation/vllm/docker_compose_llm.yaml b/comps/llms/text-generation/vllm/docker_compose_llm.yaml
@@ -12,9 +12,9 @@ services:
     volumes:
       - "./data:/data"
     environment:
+      no_proxy: ${no_proxy}
       http_proxy: ${http_proxy}
       https_proxy: ${https_proxy}
-      no_proxy: ${no_proxy}
       LLM_MODEL_ID: ${LLM_MODEL_ID}
       HF_TOKEN: ${HUGGINGFACEHUB_API_TOKEN}
     command: /bin/sh -c "cd / && export VLLM_CPU_KVCACHE_SPACE=40 && python3 -m vllm.entrypoints.openai.api_server --host 0.0.0.0 --model $LLM_MODEL_ID --port 80"
@@ -25,9 +25,9 @@ services:
       - "9000:9000"
     ipc: host
     environment:
+      no_proxy: ${no_proxy}
       http_proxy: ${http_proxy}
       https_proxy: ${https_proxy}
-      no_proxy: ${no_proxy}
       vLLM_LLM_ENDPOINT: ${vLLM_LLM_ENDPOINT}
       LLM_MODEL_ID: ${LLM_MODEL_ID}
       HUGGINGFACEHUB_API_TOKEN: ${HUGGINGFACEHUB_API_TOKEN}

diff --git a/comps/ragas/tgi/docker_compose_llm.yaml b/comps/ragas/tgi/docker_compose_llm.yaml
@@ -20,6 +20,7 @@ services:
       - "9000:9000"
     ipc: host
     environment:
+      no_proxy: ${no_proxy}
       http_proxy: ${http_proxy}
       https_proxy: ${https_proxy}
       TGI_LLM_ENDPOINT: ${TGI_LLM_ENDPOINT}

diff --git a/comps/reranks/langchain/docker/docker_compose_reranking.yaml b/comps/reranks/langchain/docker/docker_compose_reranking.yaml
@@ -20,6 +20,7 @@ services:
       - "8000:8000"
     ipc: host
     environment:
+      no_proxy: ${no_proxy}
       http_proxy: ${http_proxy}
       https_proxy: ${https_proxy}
       TEI_RERANKING_ENDPOINT: ${TEI_RERANKING_ENDPOINT}

diff --git a/comps/retrievers/langchain/milvus/README.md b/comps/retrievers/langchain/milvus/README.md
@@ -15,6 +15,7 @@ Please refer to this [readme](../../../vectorstores/langchain/milvus/README.md).
 ## Setup Environment Variables
 
 ```bash
+export no_proxy=${your_no_proxy}
 export http_proxy=${your_http_proxy}
 export https_proxy=${your_http_proxy}
 export MILVUS=${your_milvus_host_ip}

diff --git a/comps/retrievers/langchain/redis/docker/docker_compose_retriever.yaml b/comps/retrievers/langchain/redis/docker/docker_compose_retriever.yaml
@@ -20,6 +20,7 @@ services:
       - "7000:7000"
     ipc: host
     environment:
+      no_proxy: ${no_proxy}
       http_proxy: ${http_proxy}
       https_proxy: ${https_proxy}
       REDIS_URL: ${REDIS_URL}