|
7 | 7 | # This is the Makefile to build the Coherence Python Client
|
8 | 8 | # ----------------------------------------------------------------------------------------------------------------------
|
9 | 9 |
|
| 10 | +SHELL := /bin/bash |
10 | 11 | VERSION ?=0.9.0
|
11 | 12 | CURRDIR := $(shell pwd)
|
12 | 13 | USER_ID := $(shell echo "`id -u`:`id -g`")
|
@@ -62,6 +63,9 @@ MAVEN_BUILD_OPTS :=$(USE_MAVEN_SETTINGS) -Drevision=$(MVN_VERSION) -Dcoherence.v
|
62 | 63 |
|
63 | 64 | CURRDIR := $(shell pwd)
|
64 | 65 |
|
| 66 | +COMPOSE:=$(shell type -p docker-compose || echo docker compose) |
| 67 | +$(info COMPOSE = $(COMPOSE)) |
| 68 | + |
65 | 69 | # ----------------------------------------------------------------------------------------------------------------------
|
66 | 70 | # Clean-up all of the build artifacts
|
67 | 71 | # ----------------------------------------------------------------------------------------------------------------------
|
@@ -167,14 +171,14 @@ docs: ## Generate doc
|
167 | 171 | # ----------------------------------------------------------------------------------------------------------------------
|
168 | 172 | .PHONY: test-cluster-startup
|
169 | 173 | test-cluster-startup: $(BUILD_PROPS) ## Startup any test cluster members using docker-compose
|
170 |
| - cd tests/utils && docker-compose -f docker-compose-2-members.yaml up -d |
| 174 | + cd tests/utils && ${COMPOSE} -f docker-compose-2-members.yaml up -d |
171 | 175 |
|
172 | 176 | # ----------------------------------------------------------------------------------------------------------------------
|
173 | 177 | # Shutdown any cluster members via docker compose
|
174 | 178 | # ----------------------------------------------------------------------------------------------------------------------
|
175 | 179 | .PHONY: test-cluster-shutdown
|
176 | 180 | test-cluster-shutdown: ## Shutdown any test cluster members using docker-compose
|
177 |
| - cd tests/utils && docker-compose -f docker-compose-2-members.yaml down || true |
| 181 | + cd tests/utils && ${COMPOSE} -f docker-compose-2-members.yaml down || true |
178 | 182 |
|
179 | 183 |
|
180 | 184 | # ----------------------------------------------------------------------------------------------------------------------
|
|
0 commit comments