Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Standardize image build. #472

Merged
merged 13 commits into from
Aug 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/test_agent_langchain.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ function build_docker_images() {
echo "Building the docker images"
cd $WORKPATH
echo $WORKPATH
docker build -t opea/comps-agent-langchain:comps -f comps/agent/langchain/docker/Dockerfile .
docker build --no-cache -t opea/comps-agent-langchain:comps -f comps/agent/langchain/docker/Dockerfile .
if $? ; then
echo "opea/comps-agent-langchain built fail"
exit 1
Expand Down
2 changes: 1 addition & 1 deletion tests/test_dataprep_pgvector.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ function build_docker_images() {
docker pull pgvector/pgvector:0.7.0-pg16

# build dataprep image for pgvector
docker build -t opea/dataprep-pgvector:comps --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f $WORKPATH/comps/dataprep/pgvector/langchain/docker/Dockerfile .
docker build --no-cache -t opea/dataprep-pgvector:comps --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f $WORKPATH/comps/dataprep/pgvector/langchain/docker/Dockerfile .
if $? ; then
echo "opea/dataprep-pgvector built fail"
exit 1
Expand Down
2 changes: 1 addition & 1 deletion tests/test_dataprep_pinecone.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ function build_docker_images() {
cd $WORKPATH

# build dataprep image for pinecone
docker build -t opea/dataprep-pinecone:comps --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f $WORKPATH/comps/dataprep/pinecone/docker/Dockerfile .
docker build --no-cache -t opea/dataprep-pinecone:comps --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f $WORKPATH/comps/dataprep/pinecone/docker/Dockerfile .
if $? ; then
echo "opea/dataprep-pinecone built fail"
exit 1
Expand Down
2 changes: 1 addition & 1 deletion tests/test_dataprep_redis_langchain_ray.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ip_address=$(hostname -I | awk '{print $1}')
function build_docker_images() {
echo "Building the docker images"
cd $WORKPATH
docker build -t opea/dataprep-on-ray-redis:comps --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/dataprep/redis/langchain_ray/docker/Dockerfile .
docker build --no-cache -t opea/dataprep-on-ray-redis:comps --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/dataprep/redis/langchain_ray/docker/Dockerfile .
if $? ; then
echo "opea/dataprep-on-ray-redis built fail"
exit 1
Expand Down
2 changes: 1 addition & 1 deletion tests/test_guardrails_pii_detection.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ip_address=$(hostname -I | awk '{print $1}')
function build_docker_images() {
echo "Start building docker images for microservice"
cd $WORKPATH
docker build -t opea/guardrails-pii-detection:comps --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/guardrails/pii_detection/docker/Dockerfile .
docker build --no-cache -t opea/guardrails-pii-detection:comps --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/guardrails/pii_detection/docker/Dockerfile .
if $? ; then
echo "opea/guardrails-pii-detection built fail"
exit 1
Expand Down
2 changes: 1 addition & 1 deletion tests/test_llms_text-generation_vllm-openvino.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ function build_container() {
cd $WORKPATH
git clone https://github.com/vllm-project/vllm.git vllm-openvino
cd ./vllm-openvino/
docker build -t $DOCKER_IMAGE \
docker build --no-cache -t $DOCKER_IMAGE \
-f Dockerfile.openvino \
. \
--build-arg https_proxy=$https_proxy \
Expand Down
4 changes: 2 additions & 2 deletions tests/test_llms_text-generation_vllm-ray.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ function build_docker_images() {
cd $WORKPATH
docker build \
-f comps/llms/text-generation/vllm-ray/docker/Dockerfile.vllmray \
-t opea/vllm_ray-habana:comps --network=host .
--no-cache -t opea/vllm_ray-habana:comps --network=host .
if $? ; then
echo "opea/vllm_ray-habana built fail"
exit 1
Expand All @@ -23,7 +23,7 @@ function build_docker_images() {
## Build OPEA microservice docker
cd $WORKPATH
docker build \
-t opea/llm-vllm-ray:comps \
--no-cache -t opea/llm-vllm-ray:comps \
-f comps/llms/text-generation/vllm-ray/docker/Dockerfile.microservice .
if $? ; then
echo "opea/llm-vllm-ray built fail"
Expand Down
4 changes: 2 additions & 2 deletions tests/test_llms_text-generation_vllm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ function build_docker_images() {
cd $WORKPATH/comps/llms/text-generation/vllm
docker build \
-f docker/Dockerfile.hpu \
-t opea/vllm-hpu:comps \
--no-cache -t opea/vllm-hpu:comps \
--shm-size=128g .
if $? ; then
echo "opea/vllm-hpu built fail"
Expand All @@ -24,7 +24,7 @@ function build_docker_images() {
## Build OPEA microservice docker
cd $WORKPATH
docker build \
-t opea/llm-vllm:comps \
--no-cache -t opea/llm-vllm:comps \
-f comps/llms/text-generation/vllm/docker/Dockerfile.microservice .
if $? ; then
echo "opea/llm-vllm built fail"
Expand Down
2 changes: 1 addition & 1 deletion tests/test_lvms_llava.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ip_address=$(hostname -I | awk '{print $1}')
function build_docker_images() {
cd $WORKPATH
echo $(pwd)
docker build -t opea/llava:comps -f comps/lvms/llava/Dockerfile .
docker build --no-cache -t opea/llava:comps -f comps/lvms/llava/Dockerfile .
if $? ; then
echo "opea/llava built fail"
exit 1
Expand Down
3 changes: 2 additions & 1 deletion tests/test_lvms_tgi_llava_next.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,14 @@ function build_docker_images() {
cd $WORKPATH
echo $(pwd)
git clone https://github.com/yuanwu2017/tgi-gaudi.git && cd tgi-gaudi && git checkout v2.0.4
docker build -t opea/llava-tgi:comps .
docker build --no-cache -t opea/llava-tgi:comps .
if $? ; then
echo "opea/llava-tgi built fail"
exit 1
else
echo "opea/llava-tgi built successful"
fi

cd ..
docker build --no-cache -t opea/lvm-tgi:comps -f comps/lvms/Dockerfile_tgi .
if $? ; then
Expand Down
Loading