From c605d64a95ea55628870fc896f11bfd66e95334a Mon Sep 17 00:00:00 2001
From: Denys Holius <5650611+denisgolius@users.noreply.github.com>
Date: Wed, 17 May 2023 14:14:24 +0300
Subject: [PATCH] deployment/docker/Makefile: updated docker compose commands
 regarding migration from V1 to V2 (#4314)

deployment/docker/Makefile: updated docker compose commands regarding migration from V1 to V2
---
 deployment/docker/Makefile | 10 +++++-----
 docs/CHANGELOG.md          |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/deployment/docker/Makefile b/deployment/docker/Makefile
index 3bf2afdd7..6db3ac0ca 100644
--- a/deployment/docker/Makefile
+++ b/deployment/docker/Makefile
@@ -7,6 +7,7 @@ CERTS_IMAGE := alpine:3.18.0
 GO_BUILDER_IMAGE := golang:1.20.4-alpine
 BUILDER_IMAGE := local/builder:2.0.0-$(shell echo $(GO_BUILDER_IMAGE) | tr :/ __)-1
 BASE_IMAGE := local/base:1.1.4-$(shell echo $(ROOT_IMAGE) | tr :/ __)-$(shell echo $(CERTS_IMAGE) | tr :/ __)
+DOCKER_COMPOSE ?= docker compose
 
 package-base:
 	(docker image ls --format '{{.Repository}}:{{.Tag}}' | grep -q '$(BASE_IMAGE)$$') \
@@ -169,15 +170,14 @@ package-via-docker-386:
 remove-docker-images:
 	docker image ls --format '{{.Repository}}\t{{.ID}}' | awk '{print $$2}' | xargs docker image rm -f
 
-
 docker-single-up:
-	docker-compose -f deployment/docker/docker-compose.yml up
+	$(DOCKER_COMPOSE) -f deployment/docker/docker-compose.yml up -d
 
 docker-single-down:
-	docker-compose -f deployment/docker/docker-compose.yml down -v
+	$(DOCKER_COMPOSE) -f deployment/docker/docker-compose.yml down -v
 
 docker-cluster-up:
-	docker-compose -f deployment/docker/docker-compose-cluster.yml up
+	$(DOCKER_COMPOSE) -f deployment/docker/docker-compose-cluster.yml up -d
 
 docker-cluster-down:
-	docker-compose -f deployment/docker/docker-compose-cluster.yml down -v
+	$(DOCKER_COMPOSE) -f deployment/docker/docker-compose-cluster.yml down -v
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 54326cccf..51fe9d269 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -28,6 +28,7 @@ The following tip changes can be tested by building VictoriaMetrics components f
 * SECURITY: serve `/robots.txt` content to disallow indexing of the exposed instances by search engines. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/4128) for details.
 
 * FETURE: reduce memory usage by 2x and more for setups with big [retention](https://docs.victoriametrics.com/#retention) and [high churn rate](https://docs.victoriametrics.com/FAQ.html#what-is-high-churn-rate). See [this pull request](https://github.com/VictoriaMetrics/VictoriaMetrics/pull/4252).
+* FEATURE: update [docker compose environment](https://github.com/VictoriaMetrics/VictoriaMetrics/tree/master/deployment/docker#docker-compose-environment-for-victoriametrics) to V2 in respect to V1 deprecation notice from June 2023. See [Migrate to Compose V2](https://docs.docker.com/compose/migrate/).
 * FEATURE: deprecate `-bigMergeConcurrency` command-line flag, since improper configuration for this flag frequently led to uncontrolled growth of unmerged parts, which, in turn, could lead to queries slowdown and increased CPU usage. The concurrency for [background merges](https://docs.victoriametrics.com/#storage) can be controlled via `-smallMergeConcurrency` command-line flag, though it isn't recommended to change this flag in general case.
 * FEATURE: do not execute the incoming request if it has been canceled by the client before the execution start. See [this pull request](https://github.com/VictoriaMetrics/VictoriaMetrics/pull/4223).
 * FEATURE: support time formats with timezones. For example, `2024-01-02+02:00` means `January 2, 2024` at `+02:00` time zone. See [these docs](https://docs.victoriametrics.com/#timestamp-formats).