psi-jack
/
yadm
mirror of
1
0
Fork 0
Code Issues Releases Wiki Activity

Seamlessly support docker compose v1 & v2

This commit is contained in:
Tim Byrne 2022-09-03 19:05:31 -05:00
parent b276478748
commit efd227a063
No known key found for this signature in database
GPG Key ID: 14DB4FC2465A4B12
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Makefile
View File

@ -1,11 +1,13 @@
IGNORED := $(shell grep -v testenv .gitignore)
VOLUME_ARG =
COMPOSE_V2 = 0
ifeq ($(COMPOSE_V2),1)
COMPOSE_V2 := $(shell $(SHELL) -c "docker compose; exit 0" 2>&1 1>/dev/null)
ifndef COMPOSE_V2
COMPOSE_COMMAND = docker compose
else
COMPOSE_COMMAND = docker-compose
COMPOSE_V1 := $(shell command -v docker-compose)
ifdef COMPOSE_V1
COMPOSE_COMMAND = docker-compose
endif
endif
.PHONY: all
@ -85,16 +87,9 @@ fresh: clean
.PHONY: require-docker-compose
require-docker-compose: require-docker
@if [ "$(COMPOSE_V2)" = "0" ]; then \
if ! command -v "docker-compose" >/dev/null 2>&1; then \
echo "Sorry, this make target requires docker-compose to be installed. To use compose v2, re-run with COMPOSE_V2=1"; \
false; \
fi \
else \
if ! $(COMPOSE_COMMAND) >/dev/null 2>&1; then \
echo "Sorry, this make target has been configured to support docker compose v2 but the compose subcommand isn't present in docker. To use docker-compose v1, remove the COMPOSE_V2 switch"; \
false; \
fi \
@if [ -z "$(COMPOSE_COMMAND)" ]; then \
echo "Sorry, this make target requires docker compose to be supported."; \
false; \
fi
.PHONY: require-docker