Skip to content

Commit a79d8b2

Browse files
authored
Use docker compose subcommand instead of docker-compose (#2022)
1 parent 3093376 commit a79d8b2

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ that is a fixture which is defined
108108
#### Adding new instrumentations to the matrix build
109109

110110
For tests that require external dependencies like databases, or for testing different versions of the same library,
111-
we use a matrix build that leverages Docker and docker-compose.
111+
we use a matrix build that leverages Docker.
112112

113113
The setup requires a little bit of boilerplate to get started.
114114
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
153153
image: foobase:latest
154154

155155
You'll also have to add a `DOCKER_DEPS` environment variable to `tests/scripts/envs/foo.sh` which tells the matrix
156-
to spin up the given docker-compose service before running your tests.
156+
to spin up the given Docker compose service before running your tests.
157157
You may also need to add things like hostname configuration here.
158158

159159
DOCKER_DEPS="foo"

tests/scripts/docker/run_tests.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -ex
33

44
function cleanup {
5-
PYTHON_VERSION=${1} docker-compose down -v
5+
PYTHON_VERSION=${1} docker compose down -v
66

77
if [[ $CODECOV_TOKEN ]]; then
88
cd ..
@@ -42,7 +42,7 @@ echo "Running tests for ${1}/${2}"
4242

4343
if [[ -n $DOCKER_DEPS ]]
4444
then
45-
PYTHON_VERSION=${1} docker-compose up -d ${DOCKER_DEPS}
45+
PYTHON_VERSION=${1} docker compose up -d ${DOCKER_DEPS}
4646
fi
4747

4848
# CASS_DRIVER_NO_EXTENSIONS is set so we don't build the Cassandra C-extensions,
@@ -57,7 +57,7 @@ if ! ${CI}; then
5757
.
5858
fi
5959

60-
PYTHON_VERSION=${1} docker-compose run \
60+
PYTHON_VERSION=${1} docker compose run \
6161
-e PYTHON_FULL_VERSION=${1} \
6262
-e LOCAL_USER_ID=$LOCAL_USER_ID \
6363
-e LOCAL_GROUP_ID=$LOCAL_GROUP_ID \

0 commit comments

Comments
 (0)