Skip to content

Commit e16ab7c

Browse files
authored
COH-29907 - Fix error from "docker-compose: not found" on GitHub CI (#129)
* COH-29907 - Fix error from "docker-compose: not found" on GitHub CI
1 parent cb66a91 commit e16ab7c

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

Makefile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
# This is the Makefile to build the Coherence Python Client
88
# ----------------------------------------------------------------------------------------------------------------------
99

10+
SHELL := /bin/bash
1011
VERSION ?=0.9.0
1112
CURRDIR := $(shell pwd)
1213
USER_ID := $(shell echo "`id -u`:`id -g`")
@@ -62,6 +63,9 @@ MAVEN_BUILD_OPTS :=$(USE_MAVEN_SETTINGS) -Drevision=$(MVN_VERSION) -Dcoherence.v
6263

6364
CURRDIR := $(shell pwd)
6465

66+
COMPOSE:=$(shell type -p docker-compose || echo docker compose)
67+
$(info COMPOSE = $(COMPOSE))
68+
6569
# ----------------------------------------------------------------------------------------------------------------------
6670
# Clean-up all of the build artifacts
6771
# ----------------------------------------------------------------------------------------------------------------------
@@ -167,14 +171,14 @@ docs: ## Generate doc
167171
# ----------------------------------------------------------------------------------------------------------------------
168172
.PHONY: test-cluster-startup
169173
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
171175

172176
# ----------------------------------------------------------------------------------------------------------------------
173177
# Shutdown any cluster members via docker compose
174178
# ----------------------------------------------------------------------------------------------------------------------
175179
.PHONY: test-cluster-shutdown
176180
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
178182

179183

180184
# ----------------------------------------------------------------------------------------------------------------------

0 commit comments

Comments
 (0)