Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docker-compose: support v1 and v2 #394

Merged
merged 1 commit into from
Jan 30, 2024
Merged

docker-compose: support v1 and v2 #394

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion mk/containerized.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading