Skip to content

Commit 103e5ed

Browse files
committed
Release v1.0.12: harden Compose V2 detection in Makefiles.
Probe docker compose with an absolute docker binary, then fall back to docker-compose.
1 parent dcef3f7 commit 103e5ed

5 files changed

Lines changed: 28 additions & 4 deletions

File tree

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# Makefile for API Studio Bundle
22

33
COMPOSE_FILE := docker-compose.yml
4-
# Prefer Compose V2; use absolute docker path so a local ./docker/ dir cannot shadow the CLI (PATH has ".").
4+
# Prefer Compose V2 with absolute docker path (avoid ./docker/ shadowing when PATH has ".") (REQ-MAKE-010).
55
DOCKER_BIN := $(shell command -v docker 2>/dev/null)
66
ifeq ($(DOCKER_BIN),)
77
COMPOSE_BIN := docker-compose
88
else
9-
COMPOSE_BIN := $(DOCKER_BIN) compose
9+
COMPOSE_BIN := $(shell $(DOCKER_BIN) compose version >/dev/null 2>&1 && echo "$(DOCKER_BIN) compose" || echo "docker-compose")
1010
endif
1111
COMPOSE := $(COMPOSE_BIN) -f $(COMPOSE_FILE)
1212
SERVICE_PHP := php

demo/symfony8/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ DOCKER_BIN := $(shell command -v docker 2>/dev/null)
33
ifeq ($(DOCKER_BIN),)
44
COMPOSE ?= docker-compose
55
else
6-
COMPOSE ?= $(DOCKER_BIN) compose
6+
COMPOSE ?= $(shell $(DOCKER_BIN) compose version >/dev/null 2>&1 && echo "$(DOCKER_BIN) compose" || echo "docker-compose")
77
endif
88

99
.PHONY: help up down build install shell logs test test-coverage cache-clear reset-demo link-bundle update-bundle ensure-up restart release-check setup verify

demo/symfony8/composer.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
88
## Table of contents
99

1010
- [[Unreleased]](#unreleased)
11+
- [[1.0.12] - 2026-07-29](#1012-2026-07-29)
1112
- [[1.0.11] - 2026-07-29](#1011-2026-07-29)
1213
- [[1.0.10] - 2026-07-28](#1010-2026-07-28)
1314
- [[1.0.9] - 2026-07-28](#109-2026-07-28)
@@ -23,6 +24,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2324

2425
## [Unreleased]
2526

27+
## [1.0.12] - 2026-07-29
28+
29+
### Changed
30+
31+
- Makefiles probe Compose V2 via absolute `docker` binary (`command -v`) before falling back to `docker-compose` (REQ-MAKE-010).
32+
33+
### Compatibility
34+
35+
- Unchanged: PHP `>=8.2 <8.6`, Symfony `^7.0 || ^8.0`.
36+
37+
[1.0.12]: https://github.com/nowo-tech/ApiStudioBundle/releases/tag/v1.0.12
38+
2639
## [1.0.11] - 2026-07-29
2740

2841
### Changed

docs/UPGRADING.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
- [General](#general)
66
- [Before upgrading](#before-upgrading)
7+
- [To 1.0.12](#to-1012)
78
- [To 1.0.11](#to-1011)
89
- [To 1.0.10](#to-1010)
910
- [To 1.0.9](#to-109)
@@ -28,6 +29,16 @@ Follow [CHANGELOG.md](CHANGELOG.md) for breaking changes between versions.
2829
2. Run your test suite and `composer audit`.
2930
3. Back up the database if you store Api Studio entities in production.
3031

32+
## To 1.0.12
33+
34+
From **1.0.11** — maintainer Makefile only.
35+
36+
```bash
37+
composer update nowo-tech/api-studio-bundle
38+
```
39+
40+
No application changes. Makefiles probe Compose V2 with an absolute `docker` path, then fall back to `docker-compose`.
41+
3142
## To 1.0.11
3243

3344
From **1.0.10** — maintainer Makefile only.

0 commit comments

Comments
 (0)