Skip to content

Commit dcef3f7

Browse files
committed
Release v1.0.11: resolve docker CLI via absolute path in Makefiles.
Prefer Compose V2 and avoid shadowing by demo/symfony8/docker/ when PATH includes the current directory.
1 parent f432fb3 commit dcef3f7

6 files changed

Lines changed: 63 additions & 30 deletions

File tree

Makefile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
11
# Makefile for API Studio Bundle
22

33
COMPOSE_FILE := docker-compose.yml
4-
COMPOSE := docker-compose -f $(COMPOSE_FILE)
4+
# Prefer Compose V2; use absolute docker path so a local ./docker/ dir cannot shadow the CLI (PATH has ".").
5+
DOCKER_BIN := $(shell command -v docker 2>/dev/null)
6+
ifeq ($(DOCKER_BIN),)
7+
COMPOSE_BIN := docker-compose
8+
else
9+
COMPOSE_BIN := $(DOCKER_BIN) compose
10+
endif
11+
COMPOSE := $(COMPOSE_BIN) -f $(COMPOSE_FILE)
512
SERVICE_PHP := php
613

714
.PHONY: help up down down-dev build shell install assets test test-coverage cs-check cs-fix qa clean release-check release-check-demos composer-sync rector rector-dry phpstan update validate validate-translations check-no-cursor-coauthor check-open-prs strip-cursor-coauthor-from-history setup-hooks demo-smoke

composer.lock

Lines changed: 18 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo/symfony8/Makefile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
# Prefer docker-compose v1 binary; fall back to Compose V2 plugin (GitHub Actions).
2-
ifeq ($(shell command -v docker-compose 2>/dev/null),)
3-
COMPOSE := docker compose
1+
# Prefer Compose V2; absolute docker path avoids shadowing by demo/symfony8/docker/ when PATH has "." (REQ-MAKE-010).
2+
DOCKER_BIN := $(shell command -v docker 2>/dev/null)
3+
ifeq ($(DOCKER_BIN),)
4+
COMPOSE ?= docker-compose
45
else
5-
COMPOSE := docker-compose
6+
COMPOSE ?= $(DOCKER_BIN) compose
67
endif
78

89
.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: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/CHANGELOG.md

Lines changed: 14 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.11] - 2026-07-29](#1011-2026-07-29)
1112
- [[1.0.10] - 2026-07-28](#1010-2026-07-28)
1213
- [[1.0.9] - 2026-07-28](#109-2026-07-28)
1314
- [[1.0.8] - 2026-07-28](#108-2026-07-28)
@@ -22,6 +23,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2223

2324
## [Unreleased]
2425

26+
## [1.0.11] - 2026-07-29
27+
28+
### Changed
29+
30+
- Root and demo Makefiles prefer Compose V2 (`docker compose`) with V1 fallback (REQ-MAKE-010).
31+
- Demo Makefile resolves `docker` via `command -v` so the local `demo/symfony8/docker/` directory cannot shadow the CLI when `.` is on `PATH`.
32+
33+
### Compatibility
34+
35+
- Unchanged: PHP `>=8.2 <8.6`, Symfony `^7.0 || ^8.0`.
36+
37+
[1.0.11]: https://github.com/nowo-tech/ApiStudioBundle/releases/tag/v1.0.11
38+
2539
## [1.0.10] - 2026-07-28
2640

2741
### Fixed

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.11](#to-1011)
78
- [To 1.0.10](#to-1010)
89
- [To 1.0.9](#to-109)
910
- [To 1.0.8](#to-108)
@@ -27,6 +28,16 @@ Follow [CHANGELOG.md](CHANGELOG.md) for breaking changes between versions.
2728
2. Run your test suite and `composer audit`.
2829
3. Back up the database if you store Api Studio entities in production.
2930

31+
## To 1.0.11
32+
33+
From **1.0.10** — maintainer Makefile only.
34+
35+
```bash
36+
composer update nowo-tech/api-studio-bundle
37+
```
38+
39+
No application changes. Root/demo Makefiles detect Compose V2 first (`docker compose`), then fall back to `docker-compose`. The demo Makefile uses an absolute `docker` binary path so a local `docker/` config directory is not executed when `.` is on `PATH`.
40+
3041
## To 1.0.10
3142

3243
From **1.0.9** — CI/demo tooling only.

0 commit comments

Comments
 (0)