diff --git a/Makefile b/Makefile index d0901012..1b4b2995 100644 --- a/Makefile +++ b/Makefile @@ -56,7 +56,7 @@ unsmoke: docker_compose_present @echo "" @echo "+++ Spinning down the smokers." @echo "" - cd smoke-tests && docker-compose down --volumes + cd smoke-tests && docker compose down --volumes #: use this for local smoke testing resmoke: unsmoke smoke @@ -65,4 +65,4 @@ resmoke: unsmoke smoke .PHONY: docker_compose_present docker_compose_present: - @which docker-compose || (echo "Required docker-compose command is missing"; exit 1) + @which docker compose || (echo "Required docker compose command is missing"; exit 1) diff --git a/smoke-tests/smoke-sdk-grpc-ts.bats b/smoke-tests/smoke-sdk-grpc-ts.bats index 977b0b14..c1206c2e 100644 --- a/smoke-tests/smoke-sdk-grpc-ts.bats +++ b/smoke-tests/smoke-sdk-grpc-ts.bats @@ -9,7 +9,7 @@ NODE_METER_NAME="node-monitor-meter" setup_file() { echo "# 🚧" >&3 - docker-compose up --build --detach collector ${CONTAINER_NAME} + docker compose up --build --detach collector ${CONTAINER_NAME} wait_for_ready_app ${CONTAINER_NAME} curl --silent "http://localhost:3000" wait_for_traces @@ -18,8 +18,8 @@ setup_file() { teardown_file() { cp collector/data.json collector/data-results/data-${CONTAINER_NAME}.json - docker-compose stop ${CONTAINER_NAME} - docker-compose restart collector + docker compose stop ${CONTAINER_NAME} + docker compose restart collector wait_for_flush } diff --git a/smoke-tests/smoke-sdk-grpc.bats b/smoke-tests/smoke-sdk-grpc.bats index b7085939..7c055a87 100644 --- a/smoke-tests/smoke-sdk-grpc.bats +++ b/smoke-tests/smoke-sdk-grpc.bats @@ -8,7 +8,7 @@ METER_NAME="hello-world-meter" setup_file() { echo "# 🚧" >&3 - docker-compose up --build --detach collector ${CONTAINER_NAME} + docker compose up --build --detach collector ${CONTAINER_NAME} wait_for_ready_app ${CONTAINER_NAME} curl --silent "http://localhost:3000" wait_for_traces @@ -17,8 +17,8 @@ setup_file() { teardown_file() { cp collector/data.json collector/data-results/data-${CONTAINER_NAME}.json - docker-compose stop ${CONTAINER_NAME} - docker-compose restart collector + docker compose stop ${CONTAINER_NAME} + docker compose restart collector wait_for_flush } diff --git a/smoke-tests/smoke-sdk-http-ts.bats b/smoke-tests/smoke-sdk-http-ts.bats index f426d6e1..ada88b3a 100644 --- a/smoke-tests/smoke-sdk-http-ts.bats +++ b/smoke-tests/smoke-sdk-http-ts.bats @@ -9,7 +9,7 @@ NODE_METER_NAME="node-monitor-meter" setup_file() { echo "# 🚧" >&3 - docker-compose up --build --detach collector ${CONTAINER_NAME} + docker compose up --build --detach collector ${CONTAINER_NAME} wait_for_ready_app ${CONTAINER_NAME} curl --silent "http://localhost:3000" wait_for_traces @@ -18,8 +18,8 @@ setup_file() { teardown_file() { cp collector/data.json collector/data-results/data-${CONTAINER_NAME}.json - docker-compose stop ${CONTAINER_NAME} - docker-compose restart collector + docker compose stop ${CONTAINER_NAME} + docker compose restart collector wait_for_flush } diff --git a/smoke-tests/smoke-sdk-http.bats b/smoke-tests/smoke-sdk-http.bats index 98d959c0..6a67fca0 100644 --- a/smoke-tests/smoke-sdk-http.bats +++ b/smoke-tests/smoke-sdk-http.bats @@ -8,7 +8,7 @@ METER_NAME="hello-world-meter" setup_file() { echo "# 🚧" >&3 - docker-compose up --build --detach collector ${CONTAINER_NAME} + docker compose up --build --detach collector ${CONTAINER_NAME} wait_for_ready_app ${CONTAINER_NAME} curl --silent "http://localhost:3000" wait_for_traces @@ -17,8 +17,8 @@ setup_file() { teardown_file() { cp collector/data.json collector/data-results/data-${CONTAINER_NAME}.json - docker-compose stop ${CONTAINER_NAME} - docker-compose restart collector + docker compose stop ${CONTAINER_NAME} + docker compose restart collector wait_for_flush } diff --git a/smoke-tests/test_helpers/utilities.bash b/smoke-tests/test_helpers/utilities.bash index a2413a89..19cf39af 100644 --- a/smoke-tests/test_helpers/utilities.bash +++ b/smoke-tests/test_helpers/utilities.bash @@ -100,7 +100,7 @@ wait_for_ready_app() { MAX_RETRIES=10 echo -n "# 🍿 Setting up ${CONTAINER}" >&3 NEXT_WAIT_TIME=0 - until [ $NEXT_WAIT_TIME -eq $MAX_RETRIES ] || [[ $(docker-compose logs ${CONTAINER} | grep "Now listening on:") ]] + until [ $NEXT_WAIT_TIME -eq $MAX_RETRIES ] || [[ $(docker compose logs ${CONTAINER} | grep "Now listening on:") ]] do echo -n " ... $(( NEXT_WAIT_TIME++ ))s" >&3 sleep $NEXT_WAIT_TIME