From f43707e8594f09c2c7a64722aad1097f0a927e65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20Ondr=C3=A1=C4=8Dek?= Date: Sun, 26 Jul 2026 12:27:39 +0200 Subject: [PATCH] chore: use Docker compose v2+ in Makefile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Roman Ondráček --- CHANGELOG.md | 1 + Makefile | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6958cfba..ac67eccd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Remove PHP 7.2 from CI build. - Add PHP 8.5 to CI build. 2. [#172](https://github.com/influxdata/influxdb-client-php/pull/172): Suggest dependency on `ext-sockets` for `InfluxDB2\UdpWriter`. +3. [#175](https://github.com/influxdata/influxdb-client-php/pull/175): Use Docker Compose v2+ in Makefile since v1 is not maintained anymore. ## 3.8.0 [2025-06-26] diff --git a/Makefile b/Makefile index ef4ce47b..cf451cd6 100644 --- a/Makefile +++ b/Makefile @@ -5,26 +5,26 @@ help: @awk 'BEGIN {FS = ":.*##"; printf "Usage: make \033[36m\033[0m\n"} /^[a-zA-Z0-9_-]+:.*?##/ { printf " \033[36m%-46s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST) dshell: ## Start Docker Shell for Local Development - @docker-compose run --entrypoint=bash --rm php + @docker compose run --entrypoint=bash --rm php deps: ## Installs the project dependencies - @docker-compose run php composer install + @docker compose run php composer install test: start-server ## Perform unit tests - @docker-compose run php composer run test + @docker compose run php composer run test coverage: start-server ## Perform unit tests with code coverage - @docker-compose run php composer run test-coverage + @docker compose run php composer run test-coverage coverage-show: ## Show the code coverage report open build/coverage-report/index.html start-server: ## Start the InfluxDB server - @docker-compose up -d influxdb_v2 + @docker compose up -d influxdb_v2 @scripts/influxdb-onboarding.sh ||: stop-server: ## Stop the InfluxDB serve - @docker-compose stop influxdb_v2 + @docker compose stop influxdb_v2 release: ## Release client with version specified by VERSION property . make release VERSION=1.5.0 $(if $(VERSION),,$(error VERSION is not defined. Pass via "make release VERSION=1.5.0")) @@ -40,8 +40,8 @@ release: ## Release client with version specified by VERSION property . make rel git push origin master doc-generate: ## Generate documentation - @docker-compose run doxygen + @docker compose run doxygen doc-publish: ## Publish documentation as GH-Pages $(MAKE) doc-generate - @docker-compose run doc-publish + @docker compose run doc-publish