Merge pull request #394 from ceph/393-docker-compose-support-both-v1-…

…and-v2 docker-compose: support v1 and v2
ceph · Jan 30, 2024 · 245372c · 245372c
2 parents cbdb28a + f23acfa
commit 245372c
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/mk/containerized.mk b/mk/containerized.mk
@@ -2,7 +2,11 @@
 
 # Docker and docker-compose specific commands
 DOCKER = docker
-DOCKER_COMPOSE = docker-compose ## Docker-compose command
+# Docker-compose v1 or v2
+DOCKER_COMPOSE != command -v docker-compose || (DOCKER=$$(command -v docker) && printf "%s compose\n" $$DOCKER)
+ifndef DOCKER_COMPOSE
+$(error DOCKER_COMPOSE command not found. Please install from: https://docs.docker.com/engine/install/))
+endif
 DOCKER_COMPOSE_COMMANDS = pull build up run exec ps top images logs port \
 	pause unpause stop restart down events