It uses docker compose command instead of the now deprecated old docker-compose (second part).

Author: fressi-elastic

CONTRIBUTING.md

@@ -60,7 +60,7 @@ Once your changes and tests are ready to submit for review:
 
     Ensure that all tests pass by running `make check-all`. This runs sequentially lint checks, unit tests and integration tests. These can be executed in isolation using `make lint`, `make test` and `make it` respectively, in case you need to iterate over a subset of tests.
 
-    Note: Integration tests are much slower than unit tests and require `docker-compose`.
+    Note: Integration tests are much slower than unit tests and require `docker compose`.
 
 3. Sign the Contributor License Agreement
 

docs/developing.rst

@@ -8,7 +8,7 @@ Install the following software packages:
 
 * `uv <https://docs.astral.sh/uv/getting-started/installation/>`_ 
 * JDK version required to build Elasticsearch. Please refer to the `build setup requirements <https://github.com/elastic/elasticsearch/blob/main/CONTRIBUTING.md#contributing-to-the-elasticsearch-codebase>`_.
-* `Docker <https://docs.docker.com/install/>`_ and on Linux additionally `docker-compose <https://docs.docker.com/compose/install/>`_.
+* `Docker <https://docs.docker.com/install/>`_ and on Linux additionally `docker compose <https://docs.docker.com/compose/install/>`_.
 * `jq <https://stedolan.github.io/jq/download/>`_
 * git
 

recipes/ccr/start.sh

@@ -4,10 +4,10 @@ set -e
 source .elastic-version
 
 # Start metrics store
-docker-compose -f ./metricstore-docker-compose.yml up -d 
+docker compose -f ./metricstore-docker-compose.yml up -d
 
 # Start Elasticsearch
-docker-compose up -d
+docker compose up -d
 
 printf "Waiting for clusters to get ready "
 

recipes/ccr/stop.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 source .elastic-version
 
-docker-compose down -v
-docker-compose -f metricstore-docker-compose.yml down -v
+docker compose down -v
+docker compose -f metricstore-docker-compose.yml down -v

release-docker-test.sh

@@ -32,7 +32,7 @@ function check_prerequisites {
         exit 1
     fi
 
-    if ! type docker-compose > /dev/null; then
+    if ! type docker compose > /dev/null; then
         echo "docker compose is necessary to run the integration tests"
         exit 1
     fi

tests/mechanic/launcher_test.py

@@ -347,7 +347,7 @@ class TestDockerLauncher:
     @mock.patch("esrally.utils.process.run_subprocess_with_output")
     def test_starts_container_successfully(self, run_subprocess_with_output, run_subprocess_with_logging):
         run_subprocess_with_logging.return_value = 0
-        # Docker container id (from docker-compose ps), Docker container id (from docker ps --filter ...)
+        # Docker container id (from docker compose ps), Docker container id (from docker ps --filter ...)
         run_subprocess_with_output.side_effect = [["de604d0d"], ["de604d0d"]]
         cfg = config.Config()
         docker = launcher.DockerLauncher(cfg)
@@ -386,7 +386,7 @@ def test_starts_container_successfully(self, run_subprocess_with_output, run_sub
     @mock.patch("esrally.utils.process.run_subprocess_with_output")
     def test_container_not_started(self, run_subprocess_with_output, run_subprocess_with_logging, sleep):
         run_subprocess_with_logging.return_value = 0
-        # Docker container id (from docker-compose ps), but NO Docker container id (from docker ps --filter...) twice
+        # Docker container id (from docker compose ps), but NO Docker container id (from docker ps --filter...) twice
         run_subprocess_with_output.side_effect = [["de604d0d"], [], []]
         cfg = config.Config()
         # ensure we only check the status two times