From 87d2da4c010781e7780e9b5e93ab05f37fe10754 Mon Sep 17 00:00:00 2001 From: Alex Zorin Date: Wed, 19 Oct 2022 16:34:38 +1100 Subject: [PATCH] try call compose plugin cli directly --- certbot-ci/certbot_integration_tests/utils/acme_server.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/certbot-ci/certbot_integration_tests/utils/acme_server.py b/certbot-ci/certbot_integration_tests/utils/acme_server.py index 892d4d038..bf4a29629 100755 --- a/certbot-ci/certbot_integration_tests/utils/acme_server.py +++ b/certbot-ci/certbot_integration_tests/utils/acme_server.py @@ -205,7 +205,8 @@ class ACMEServer: try: # Launch the Boulder server - self._launch_process(['docker-compose', 'up', '--force-recreate'], cwd=instance_path) + self._launch_process( + [self._find_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 +224,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 + self._find_docker_compose(), 'logs'], cwd=instance_path, force_stderr=True ) process.wait() raise @@ -254,6 +255,9 @@ class ACMEServer: self._processes.append(process) return process + def _find_docker_compose(self) -> str: + return "/usr/libexec/docker/cli-plugins/docker-compose" + def main() -> None: # pylint: disable=missing-function-docstring