Skip to content

Commit

Permalink
Use the docker compose CLI (#23770)
Browse files Browse the repository at this point in the history
When we first added this fixture, docker compose relatively early in its
history and we had trouble getting it to run on buildkite. I'm opening
this PR to see if things "just work" now that it's a few years later.
  • Loading branch information
jmsanders authored Aug 21, 2024
1 parent 82e5040 commit d2d1bd6
Showing 1 changed file with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def dump_docker_compose_logs(context, docker_compose_yml):
if context:
compose_command = ["docker", "--context", context, "compose"]
else:
compose_command = ["docker-compose"]
compose_command = ["docker", "compose"]

compose_command += [
"--file",
Expand Down Expand Up @@ -89,7 +89,7 @@ def docker_compose_up(docker_compose_yml, context, service, env_file, no_build:
if context:
compose_command = ["docker", "--context", context, "compose"]
else:
compose_command = ["docker-compose"]
compose_command = ["docker", "compose"]

if env_file:
compose_command += ["--env-file", env_file]
Expand All @@ -114,7 +114,7 @@ def docker_compose_down(docker_compose_yml, context, service, env_file):
if context:
compose_command = ["docker", "--context", context, "compose"]
else:
compose_command = ["docker-compose"]
compose_command = ["docker", "compose"]

if env_file:
compose_command += ["--env-file", env_file]
Expand Down

0 comments on commit d2d1bd6

Please sign in to comment.