From 61794669fd9e44b7b1bf673556ce484b209b53c7 Mon Sep 17 00:00:00 2001
From: Eugene Klimov <eklimov@altinity.com>
Date: Sun, 11 Aug 2024 21:59:15 +0400
Subject: [PATCH] upgrade release.sh to `docker compose`, prepare 3.2.2

---
 .config/README.md                | 2 +-
 release.sh                       | 8 ++++----
 tests/testflows/regression.py    | 2 +-
 tests/testflows/steps/cluster.py | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.config/README.md b/.config/README.md
index f1ded3464..016e2bfc2 100644
--- a/.config/README.md
+++ b/.config/README.md
@@ -159,6 +159,6 @@ services:
         grafana_image: ${GRAFANA_IMAGE:-grafana}
 ```
 
-In this example we are assigning the environment variable `GRAFANA_IMAGE` to the build arg `grafana_image` with a default value of `grafana`. This will give you the possibility to set the value while running the docker-compose commands which might be convinent in some scenarios.
+In this example we are assigning the environment variable `GRAFANA_IMAGE` to the build arg `grafana_image` with a default value of `grafana`. This will give you the possibility to set the value while running the docker compose commands which might be convinent in some scenarios.
 
 ---
diff --git a/release.sh b/release.sh
index ba57f9faf..00fe29e30 100644
--- a/release.sh
+++ b/release.sh
@@ -10,13 +10,13 @@ git config core.autocrlf input
 git config user.name "$GITHUB_LOGIN"
 git config user.email "$GITHUB_EMAIL"
 bump2version --verbose $1
-docker-compose stop
-docker-compose run --rm frontend_builder
-docker-compose run --rm backend_builder
+docker compose stop
+docker compose run --rm frontend_builder
+docker compose run --rm backend_builder
 dos2unix ./dist/*
 chmod +rx ./dist
 chmod +rx -R ./dist/altinity-clickhouse-plugin*
-docker-compose run --rm plugin_signer
+docker compose run --rm plugin_signer
 git add .
 git diff-index --quiet HEAD || git commit -s -m "prepare to new release, $(grep current_version .bumpversion.cfg)"
 git push --tags
diff --git a/tests/testflows/regression.py b/tests/testflows/regression.py
index a22be772a..e6eb412d4 100755
--- a/tests/testflows/regression.py
+++ b/tests/testflows/regression.py
@@ -60,7 +60,7 @@ def regression(self, before, after):
     project_root_dir = os.path.join(current_dir(), "..", "..")
     self.context.project_root_dir = project_root_dir
 
-    with Given("docker-compose cluster"):
+    with Given("docker compose cluster"):
         self.context.cluster = cluster.cluster(frame=inspect.currentframe())
 
     with And("I copy CA Cert"):
diff --git a/tests/testflows/steps/cluster.py b/tests/testflows/steps/cluster.py
index 9ca477678..1dd08b3fb 100644
--- a/tests/testflows/steps/cluster.py
+++ b/tests/testflows/steps/cluster.py
@@ -137,7 +137,7 @@ def bash(self, node, timeout=120):
             return self._bash[id]
 
     def __enter__(self):
-        with Given("docker-compose cluster"):
+        with Given("docker compose cluster"):
             self.up()
         return self
 
@@ -227,7 +227,7 @@ def up(self, timeout=30 * 60):
                             env_file = os.path.join(current_dir(), "..", "infra", "env_file")
                             cmd = self.command(
                                 None,
-                                f"set -o pipefail && {self.docker_compose} --env-file=\"{env_file}\" up -d 2>&1 | tee",
+                                f"set -o pipefail && {self.docker_compose} --env-file=\"{env_file}\" up -d selenium-standalone 2>&1 | tee",
                                 timeout=timeout,
                             )
                     with Then("check there are no unhealthy containers"):