Skip to content

Commit

Permalink
docker compose v2 migration
Browse files Browse the repository at this point in the history
v2 uses `docker compose` instead of `docker-compose`.

Ubuntu gha runners now ship with v2 only, see
actions/runner-images#9692
  • Loading branch information
dtrifiro committed Aug 20, 2024
1 parent 484d061 commit fcbbaec
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions test/compose/smoke-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)

IMAGE="caikit-tgis-serving:dev"

if ! command -v docker-compose &>/dev/null; then
echo "This requires docker-compose" 2>&1
if ! command -v docker compose &>/dev/null; then
echo "This requires docker compose" 2>&1
exit 1
fi

Expand Down Expand Up @@ -39,18 +39,18 @@ if [[ -n $CI ]]; then # Free up some space on CI
rm -rf ~/.cache/huggingface
fi

docker-compose up -d
docker compose up -d

pip install caikit-nlp-client

echo -e "\n=== Testing endpoints..."
if ! python ../smoke-test.py; then
echo -e "\n=== Container logs"
docker-compose logs
docker compose logs
echo -e "\n=== 👎 Test failed\n"
docker-compose down
docker compose down
exit 1
fi

echo -e "\n=== 👍 Test successful!\n"
cd ${SCRIPT_DIR} && docker-compose down
cd ${SCRIPT_DIR} && docker compose down
2 changes: 1 addition & 1 deletion test/smoke-test.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ async def main():
inference_service_url = os.getenv("ISVC_URL")

if not inference_service_url:
print("No inference service, assuming docker-compose test")
print("No inference service, assuming docker compose test")
return await asyncio.gather(
test_grpc(),
test_http(),
Expand Down

0 comments on commit fcbbaec

Please sign in to comment.