From dd33a2e9b26befe2fb298db54be6d149b6632549 Mon Sep 17 00:00:00 2001 From: Udai Jain Date: Fri, 14 Jun 2024 03:13:50 +0000 Subject: [PATCH 1/2] fixing docker ci --- .github/workflows/docker-ci.yaml | 4 ++-- docker/dockerd-entrypoint.sh | 2 +- docker/test_container_model_prediction.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-ci.yaml b/.github/workflows/docker-ci.yaml index 50106256db..053cbbf8d5 100644 --- a/.github/workflows/docker-ci.yaml +++ b/.github/workflows/docker-ci.yaml @@ -29,7 +29,7 @@ jobs: working-directory: docker run: | IMAGE_TAG=test-image-${{ matrix.python-version }} - ./build_image.sh -py "${{ matrix.python-version }}" -t "${IMAGE_TAG}" + ./build_image.sh -py "${{ matrix.python-version }}" -t "${IMAGE_TAG}" -s -r echo "IMAGE_TAG=${IMAGE_TAG}" >> $GITHUB_OUTPUT - name: Container Healthcheck @@ -40,7 +40,7 @@ jobs: working-directory: docker run: ./test_container_python_version.sh ${{ steps.image_build.outputs.IMAGE_TAG }} ${{ matrix.python-version }} - - name: Test model running in container with sample image data + - name: Test model running in container with sample image data working-directory: docker run: | ./test_container_model_prediction.sh ${{ steps.image_build.outputs.IMAGE_TAG }} diff --git a/docker/dockerd-entrypoint.sh b/docker/dockerd-entrypoint.sh index 41ba00b048..2534938b25 100755 --- a/docker/dockerd-entrypoint.sh +++ b/docker/dockerd-entrypoint.sh @@ -3,7 +3,7 @@ set -e if [[ "$1" = "serve" ]]; then shift 1 - torchserve --start --ts-config /home/model-server/config.properties + torchserve --start --ts-config /home/model-server/config.properties --disable-token else eval "$@" fi diff --git a/docker/test_container_model_prediction.sh b/docker/test_container_model_prediction.sh index 0388729ac9..58cc15e89f 100755 --- a/docker/test_container_model_prediction.sh +++ b/docker/test_container_model_prediction.sh @@ -19,7 +19,7 @@ torch-model-archiver \ --handler=/home/model-server/mnist_handler.py \ --export-path=/home/model-server/model-store -torchserve --start --ts-config=/home/model-server/config.properties --models mnist=mnist.mar +torchserve --start --ts-config=/home/model-server/config.properties --models mnist=mnist.mar --disable-token EOF echo "Starting container ${CONTAINER}" From f9926403881c23434be98ed3f9d5e3877e7f4a52 Mon Sep 17 00:00:00 2001 From: Udai Jain Date: Fri, 14 Jun 2024 03:24:15 +0000 Subject: [PATCH 2/2] fixing local print --- docker/build_image.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/build_image.sh b/docker/build_image.sh index f773791784..040fc307c2 100755 --- a/docker/build_image.sh +++ b/docker/build_image.sh @@ -36,7 +36,7 @@ do echo "-py, --pythonversion specify to python version to use: Possible values: 3.8 3.9 3.10" echo "-n, --nightly specify to build with TorchServe nightly" echo "-s, --source specify to build with TorchServe from source" - echo "-l, --local specify to use local TorchServe" + echo "-r, --remote specify to use local TorchServe" exit 0 ;; -b|--branch_name)