From d143555fbb46638d02c6432a4726b436e3d264d3 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Mon, 15 Jan 2024 22:39:15 +0100 Subject: [PATCH] Also check for compose.yaml and compose.yml, and do not require the Compose file to be an actual file. --- plugins/module_utils/compose_v2.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/module_utils/compose_v2.py b/plugins/module_utils/compose_v2.py index 272a830de..ed54c464c 100644 --- a/plugins/module_utils/compose_v2.py +++ b/plugins/module_utils/compose_v2.py @@ -18,7 +18,7 @@ from ansible_collections.community.docker.plugins.module_utils.version import LooseVersion -DOCKER_COMPOSE_FILES = 'docker-compose.yml', 'docker-compose.yaml' +DOCKER_COMPOSE_FILES = ('compose.yaml', 'compose.yml', 'docker-compose.yaml', 'docker-compose.yml') DOCKER_STATUS_DONE = frozenset(( 'Started', @@ -436,8 +436,9 @@ def __init__(self, client, min_version='2.18.0'): if not os.path.isdir(self.project_src): self.client.fail('"{0}" is not a directory'.format(self.project_src)) - if all(not os.path.isfile(os.path.join(self.project_src, f)) for f in DOCKER_COMPOSE_FILES): - self.client.fail('"{0}" does not contain {1}'.format(self.project_src, ' or '.join(DOCKER_COMPOSE_FILES))) + if all(not os.path.exists(os.path.join(self.project_src, f)) for f in DOCKER_COMPOSE_FILES): + filenames = ', '.join(DOCKER_COMPOSE_FILES[:-1]) + self.client.fail('"{0}" does not contain {1}, or {2}'.format(self.project_src, filenames, DOCKER_COMPOSE_FILES[-1])) def get_base_args(self): args = ['compose', '--ansi', 'never']