From a79d8b2c67c772a0451da1536b360a0cb404a504 Mon Sep 17 00:00:00 2001
From: Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com>
Date: Wed, 3 Apr 2024 09:20:59 +0200
Subject: [PATCH] Use docker compose subcommand instead of docker-compose
 (#2022)

---
 CONTRIBUTING.md                   | 4 ++--
 tests/scripts/docker/run_tests.sh | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 014b4828d..21180e9f1 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -108,7 +108,7 @@ that is a fixture which is defined
 #### Adding new instrumentations to the matrix build
 
 For tests that require external dependencies like databases, or for testing different versions of the same library,
-we use a matrix build that leverages Docker and docker-compose.
+we use a matrix build that leverages Docker.
 
 The setup requires a little bit of boilerplate to get started.
 In this example, we will create an instrumentation for the "foo" database, by instrumenting its Python driver, `foodriver`.
@@ -153,7 +153,7 @@ In this example, we will create an instrumentation for the "foo" database, by in
              image: foobase:latest
 
     You'll also have to add a `DOCKER_DEPS` environment variable to `tests/scripts/envs/foo.sh` which tells the matrix
-    to spin up the given docker-compose service before running your tests.
+    to spin up the given Docker compose service before running your tests.
     You may also need to add things like hostname configuration here.
 
         DOCKER_DEPS="foo"
diff --git a/tests/scripts/docker/run_tests.sh b/tests/scripts/docker/run_tests.sh
index 9a89f93be..de518dc32 100755
--- a/tests/scripts/docker/run_tests.sh
+++ b/tests/scripts/docker/run_tests.sh
@@ -2,7 +2,7 @@
 set -ex
 
 function cleanup {
-    PYTHON_VERSION=${1} docker-compose down -v
+    PYTHON_VERSION=${1} docker compose down -v
 
     if [[ $CODECOV_TOKEN ]]; then
         cd ..
@@ -42,7 +42,7 @@ echo "Running tests for ${1}/${2}"
 
 if [[ -n $DOCKER_DEPS ]]
 then
-    PYTHON_VERSION=${1} docker-compose up -d ${DOCKER_DEPS}
+    PYTHON_VERSION=${1} docker compose up -d ${DOCKER_DEPS}
 fi
 
 # CASS_DRIVER_NO_EXTENSIONS is set so we don't build the Cassandra C-extensions,
@@ -57,7 +57,7 @@ if ! ${CI}; then
     .
 fi
 
-PYTHON_VERSION=${1} docker-compose run \
+PYTHON_VERSION=${1} docker compose run \
   -e PYTHON_FULL_VERSION=${1} \
   -e LOCAL_USER_ID=$LOCAL_USER_ID \
   -e LOCAL_GROUP_ID=$LOCAL_GROUP_ID \