use docker compose

certbot-ci/certbot_integration_tests/conftest.py

@@ -69,7 +69,7 @@ def _setup_primary_node(config):
     Setup the environment for integration tests.
 
     This function will:
-        - check runtime compatibility (Docker, docker-compose, Nginx)
+        - check runtime compatibility (Docker, docker compose, Nginx)
         - create a temporary workspace and the persistent GIT repositories space
         - configure and start a DNS server using Docker, if configured
         - configure and start paralleled ACME CA servers using Docker
@@ -89,10 +89,10 @@ def _setup_primary_node(config):
                              'boulder, but is not installed or not available for current user.')
 
         try:
-            subprocess.check_output(['docker-compose', '-v'], stderr=subprocess.STDOUT)
+            subprocess.check_output(['docker', 'compose'], stderr=subprocess.STDOUT)
         except (subprocess.CalledProcessError, OSError):
             raise ValueError(
-                'Error: docker-compose is required in PATH to launch the integration tests, '
+                'Error: docker compose is required in PATH to launch the integration tests, '
                 'but is not installed or not available for current user.'
             )
 

certbot-ci/certbot_integration_tests/utils/acme_server.py

@@ -205,7 +205,7 @@ class ACMEServer:
 
         try:
             # Launch the Boulder server
-            self._launch_process(['docker-compose', 'up', '--force-recreate'], cwd=instance_path)
+            self._launch_process(['docker', 'compose', 'up', '--force-recreate'], cwd=instance_path)
 
             # Wait for the ACME CA server to be up.
             print('=> Waiting for boulder instance to respond...')
@@ -223,7 +223,7 @@ class ACMEServer:
             # If we failed to set up boulder, print its logs.
             print('=> Boulder setup failed. Boulder logs are:')
             process = self._launch_process([
-                'docker-compose', 'logs'], cwd=instance_path, force_stderr=True
+                'docker', 'compose', 'logs'], cwd=instance_path, force_stderr=True
             )
             process.wait()
             raise

tox.ini

@@ -185,9 +185,9 @@ passenv =
 # tests the Dockerfile-dev file to ensure development with it works
 # as expected
 commands =
-    docker-compose run --rm --service-ports development bash -c 'tox -e lint'
+    docker compose run --rm --service-ports development bash -c 'tox -e lint'
 whitelist_externals =
-    docker-compose
+    docker compose
 passenv = DOCKER_*
 
 [testenv:integration]