Skip to content

COH-29907 - Fix error from "docker-compose: not found" on GitHub CI #129

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

Merged
merged 3 commits into from
Apr 3, 2024
Merged

COH-29907 - Fix error from "docker-compose: not found" on GitHub CI #129

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fde506f
COH-29907 - Fix error from "docker-compose: not found" on GitHub CI
dhirupandey Apr 3, 2024
fd2d3e0
COH-29907 - Fix error from "docker-compose: not found" on GitHub CI
dhirupandey Apr 3, 2024
5bf2715
COH-29907 - Fix error from "docker-compose: not found" on GitHub CI
dhirupandey Apr 3, 2024
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
8 changes: 6 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
# This is the Makefile to build the Coherence Python Client
# ----------------------------------------------------------------------------------------------------------------------

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

CURRDIR := $(shell pwd)

COMPOSE:=$(shell type -p docker-compose || echo docker compose)
$(info COMPOSE = $(COMPOSE))

# ----------------------------------------------------------------------------------------------------------------------
# Clean-up all of the build artifacts
# ----------------------------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -167,14 +171,14 @@ docs: ## Generate doc
# ----------------------------------------------------------------------------------------------------------------------
.PHONY: test-cluster-startup
test-cluster-startup: $(BUILD_PROPS) ## Startup any test cluster members using docker-compose
cd tests/utils && docker-compose -f docker-compose-2-members.yaml up -d
cd tests/utils && ${COMPOSE} -f docker-compose-2-members.yaml up -d

# ----------------------------------------------------------------------------------------------------------------------
# Shutdown any cluster members via docker compose
# ----------------------------------------------------------------------------------------------------------------------
.PHONY: test-cluster-shutdown
test-cluster-shutdown: ## Shutdown any test cluster members using docker-compose
cd tests/utils && docker-compose -f docker-compose-2-members.yaml down || true
cd tests/utils && ${COMPOSE} -f docker-compose-2-members.yaml down || true


# ----------------------------------------------------------------------------------------------------------------------
Expand Down