Skip to content

Switch docker-compose version #4

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
citizen-stig merged 2 commits into from
Nov 20, 2025
Merged

Switch docker-compose version #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2fd109a
Switch docker-compose version
preston-evans98 Oct 10, 2025
31e2d5d
Hack around CI
citizen-stig Nov 20, 2025
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: 5 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
.PHONY: up down restart logs ps clean grafana prometheus loki tempo influxdb help

PROJECT_ROOT := $(shell git rev-parse --show-toplevel)
DOCKER_COMPOSE := docker compose
# Detect which docker compose command is available
# docker-setup-buildx doesn’t install docker-compose v1, and the GitHub Actions runner no longer includes it.
DOCKER_COMPOSE := $(shell if command -v docker-compose >/dev/null 2>&1; then echo "docker-compose"; else echo "docker compose"; fi)

# Default target
.DEFAULT_GOAL := help
Expand All @@ -13,7 +15,7 @@ start:
@echo "Waiting for all services to become healthy..."
@timeout=60; \
while [ $$timeout -gt 0 ]; do \
if docker compose ps --format json | jq -e 'select(.Health != "healthy") | .Name' > /dev/null 2>&1; then \
if $(DOCKER_COMPOSE) ps --format json | jq -e 'select(.Health != "healthy") | .Name' > /dev/null 2>&1; then \
printf "\r⏳ Waiting for services... ($$timeout seconds remaining) "; \
sleep 1; \
timeout=$$((timeout - 1)); \
Expand All @@ -31,7 +33,7 @@ start:
done; \
echo ""; \
echo "⚠️ Timeout waiting for services to become healthy"; \
echo "Check service status with: docker compose ps"; \
echo "Check service status with: $DOCKER_COMPOSE ps"; \
echo "View logs with: make logs"; \
exit 1

Expand Down