diff --git a/clearml_serving/engines/triton/entrypoint.sh b/clearml_serving/engines/triton/entrypoint.sh index a896525..41a0d6a 100755 --- a/clearml_serving/engines/triton/entrypoint.sh +++ b/clearml_serving/engines/triton/entrypoint.sh @@ -5,13 +5,13 @@ echo CLEARML_SERVING_TASK_ID="$CLEARML_SERVING_TASK_ID" echo CLEARML_TRITON_POLL_FREQ="$CLEARML_TRITON_POLL_FREQ" echo CLEARML_TRITON_METRIC_FREQ="$CLEARML_TRITON_METRIC_FREQ" echo CLEARML_TRITON_HELPER_ARGS="$CLEARML_TRITON_HELPER_ARGS" -echo EXTRA_PYTHON_PACKAGES="$EXTRA_PYTHON_PACKAGES" +echo CLEARML_EXTRA_PYTHON_PACKAGES="$CLEARML_EXTRA_PYTHON_PACKAGES" # we should also have clearml-server configurations -if [ ! -z "$EXTRA_PYTHON_PACKAGES" ] +if [ ! -z "$CLEARML_EXTRA_PYTHON_PACKAGES" ] then - python3 -m pip install $EXTRA_PYTHON_PACKAGES + python3 -m pip install $CLEARML_EXTRA_PYTHON_PACKAGES fi # start service diff --git a/clearml_serving/serving/entrypoint.sh b/clearml_serving/serving/entrypoint.sh index 2e1bf71..eba3867 100755 --- a/clearml_serving/serving/entrypoint.sh +++ b/clearml_serving/serving/entrypoint.sh @@ -4,7 +4,7 @@ echo CLEARML_SERVING_TASK_ID="$CLEARML_SERVING_TASK_ID" echo CLEARML_SERVING_PORT="$CLEARML_SERVING_PORT" echo CLEARML_USE_GUNICORN="$CLEARML_USE_GUNICORN" -echo EXTRA_PYTHON_PACKAGES="$EXTRA_PYTHON_PACKAGES" +echo CLEARML_EXTRA_PYTHON_PACKAGES="$CLEARML_EXTRA_PYTHON_PACKAGES" echo CLEARML_SERVING_NUM_PROCESS="$CLEARML_SERVING_NUM_PROCESS" echo CLEARML_SERVING_POLL_FREQ="$CLEARML_SERVING_POLL_FREQ" echo CLEARML_DEFAULT_KAFKA_SERVE_URL="$CLEARML_DEFAULT_KAFKA_SERVE_URL" @@ -31,9 +31,9 @@ echo CLEARML_DEFAULT_BASE_SERVE_URL="$CLEARML_DEFAULT_BASE_SERVE_URL" echo CLEARML_DEFAULT_TRITON_GRPC_ADDR="$CLEARML_DEFAULT_TRITON_GRPC_ADDR" # runtime add extra python packages -if [ ! -z "$EXTRA_PYTHON_PACKAGES" ] +if [ ! -z "$CLEARML_EXTRA_PYTHON_PACKAGES" ] then - python3 -m pip install $EXTRA_PYTHON_PACKAGES + python3 -m pip install $CLEARML_EXTRA_PYTHON_PACKAGES fi if [ -z "$CLEARML_USE_GUNICORN" ] diff --git a/clearml_serving/statistics/entrypoint.sh b/clearml_serving/statistics/entrypoint.sh index 2ed724b..1af8bef 100755 --- a/clearml_serving/statistics/entrypoint.sh +++ b/clearml_serving/statistics/entrypoint.sh @@ -3,7 +3,7 @@ # print configuration echo CLEARML_SERVING_TASK_ID="$CLEARML_SERVING_TASK_ID" echo CLEARML_SERVING_PORT="$CLEARML_SERVING_PORT" -echo EXTRA_PYTHON_PACKAGES="$EXTRA_PYTHON_PACKAGES" +echo CLEARML_EXTRA_PYTHON_PACKAGES="$CLEARML_EXTRA_PYTHON_PACKAGES" echo CLEARML_SERVING_POLL_FREQ="$CLEARML_SERVING_POLL_FREQ" echo CLEARML_DEFAULT_KAFKA_SERVE_URL="$CLEARML_DEFAULT_KAFKA_SERVE_URL" @@ -17,9 +17,9 @@ CLEARML_DEFAULT_TRITON_GRPC_ADDR="${CLEARML_DEFAULT_TRITON_GRPC_ADDR:-127.0.0.1: echo SERVING_PORT="$SERVING_PORT" # runtime add extra python packages -if [ ! -z "$EXTRA_PYTHON_PACKAGES" ] +if [ ! -z "$CLEARML_EXTRA_PYTHON_PACKAGES" ] then - python3 -m pip install $EXTRA_PYTHON_PACKAGES + python3 -m pip install $CLEARML_EXTRA_PYTHON_PACKAGES fi echo "Starting Statistics Controller server" diff --git a/docker/docker-compose-triton-gpu.yml b/docker/docker-compose-triton-gpu.yml index de0721e..16d9908 100644 --- a/docker/docker-compose-triton-gpu.yml +++ b/docker/docker-compose-triton-gpu.yml @@ -12,7 +12,7 @@ services: - clearml-serving-backend kafka: - image: bitnami/kafka:3.1.0 + image: bitnami/kafka:3.1.1 container_name: clearml-serving-kafka # ports: # - "9092:9092" @@ -94,6 +94,7 @@ services: CLEARML_DEFAULT_TRITON_GRPC_ADDR: ${CLEARML_DEFAULT_TRITON_GRPC_ADDR:-clearml-serving-triton:8001} CLEARML_USE_GUNICORN: ${CLEARML_USE_GUNICORN:-} CLEARML_SERVING_NUM_PROCESS: ${CLEARML_SERVING_NUM_PROCESS:-} + CLEARML_EXTRA_PYTHON_PACKAGES: ${CLEARML_EXTRA_PYTHON_PACKAGES:-} depends_on: - kafka - clearml-serving-triton diff --git a/docker/docker-compose-triton.yml b/docker/docker-compose-triton.yml index 9cd28b8..eb4ea4a 100644 --- a/docker/docker-compose-triton.yml +++ b/docker/docker-compose-triton.yml @@ -12,7 +12,7 @@ services: - clearml-serving-backend kafka: - image: bitnami/kafka:3.1.0 + image: bitnami/kafka:3.1.1 container_name: clearml-serving-kafka # ports: # - "9092:9092" @@ -94,6 +94,7 @@ services: CLEARML_DEFAULT_TRITON_GRPC_ADDR: ${CLEARML_DEFAULT_TRITON_GRPC_ADDR:-clearml-serving-triton:8001} CLEARML_USE_GUNICORN: ${CLEARML_USE_GUNICORN:-} CLEARML_SERVING_NUM_PROCESS: ${CLEARML_SERVING_NUM_PROCESS:-} + CLEARML_EXTRA_PYTHON_PACKAGES: ${CLEARML_EXTRA_PYTHON_PACKAGES:-} depends_on: - kafka - clearml-serving-triton diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 54f4f32..fc42033 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -12,7 +12,7 @@ services: - clearml-serving-backend kafka: - image: bitnami/kafka:3.1.0 + image: bitnami/kafka:3.1.1 container_name: clearml-serving-kafka # ports: # - "9092:9092" @@ -94,6 +94,7 @@ services: CLEARML_DEFAULT_TRITON_GRPC_ADDR: ${CLEARML_DEFAULT_TRITON_GRPC_ADDR:-} CLEARML_USE_GUNICORN: ${CLEARML_USE_GUNICORN:-} CLEARML_SERVING_NUM_PROCESS: ${CLEARML_SERVING_NUM_PROCESS:-} + CLEARML_EXTRA_PYTHON_PACKAGES: ${CLEARML_EXTRA_PYTHON_PACKAGES:-} depends_on: - kafka networks: