From 4f9a243660cb829c7cf79656f8d11bee2d59ca16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Leszczy=C5=84ski?= <2000michal@wp.pl>
Date: Wed, 3 Apr 2024 15:40:03 +0200
Subject: [PATCH] fix(makefile): use docker compose instead of docker-compose

---
 docs/source/docker/index.rst     | 10 +++++-----
 install-dependencies.sh          |  2 +-
 testing/Makefile                 |  2 +-
 testing/corrupt                  |  2 +-
 testing/docker-compose-ipv4.yaml |  2 --
 testing/docker-compose-ipv6.yaml |  2 --
 testing/docker-compose.yaml      |  2 --
 7 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/docs/source/docker/index.rst b/docs/source/docker/index.rst
index 96b31710fb..4eb8af22d2 100644
--- a/docs/source/docker/index.rst
+++ b/docs/source/docker/index.rst
@@ -13,7 +13,7 @@ Note that `Scylla Kubernetes Operator <https://github.com/scylladb/scylla-operat
 
 **Prerequisites**
 
-Docker and docker-compose commands installed.
+Docker command installed.
 
 **Procedure**
 
@@ -34,8 +34,8 @@ Docker and docker-compose commands installed.
 
    .. code-block:: none
 
-      docker-compose up --build -d
-      docker-compose logs -f scylla-manager
+      docker compose up --build -d
+      docker compose logs -f scylla-manager
 
 #. Wait until the server is started, you should see something like
 
@@ -52,7 +52,7 @@ Docker and docker-compose commands installed.
 
    .. code-block:: none
 
-      docker-compose exec scylla-manager bash
+      docker compose exec scylla-manager bash
 
 #. Add the cluster to Scylla Manager
 
@@ -84,7 +84,7 @@ container, run the following:
 
    .. code-block:: none
 
-      docker-compose exec minio sh -c "mkdir /data/docker"
+      docker compose exec minio sh -c "mkdir /data/docker"
 
 Afterwards you can schedule backups in Scylla Manager using "s3:docker" as the
 backup location.
\ No newline at end of file
diff --git a/install-dependencies.sh b/install-dependencies.sh
index 4b68b6a8c3..d424aeb775 100755
--- a/install-dependencies.sh
+++ b/install-dependencies.sh
@@ -5,7 +5,7 @@
 
 set -eu -o pipefail
 
-LINUX_PKGS="docker-compose jq make moreutils openssl"
+LINUX_PKGS="jq make moreutils openssl"
 
 source ./env
 mkdir -p ${LOCAL_BIN}
diff --git a/testing/Makefile b/testing/Makefile
index b5eeb49258..20a4059d81 100644
--- a/testing/Makefile
+++ b/testing/Makefile
@@ -1,6 +1,6 @@
 all: help
 
-COMPOSE      := docker-compose
+COMPOSE      := docker compose
 CQLSH        := $(COMPOSE) exec scylla-manager-db cqlsh
 CQLSH_NODE   := $(COMPOSE) exec -T dc1_node_1 cqlsh
 NODETOOL     := $(COMPOSE) exec -T dc1_node_1 nodetool
diff --git a/testing/corrupt b/testing/corrupt
index d1391f8eb4..eb73482db8 100755
--- a/testing/corrupt
+++ b/testing/corrupt
@@ -5,7 +5,7 @@
 
 set -eu -o pipefail -x
 
-COMPOSE=docker-compose
+COMPOSE=docker compose
 
 NODE=
 KEYSPACE="test_keyspace_rf3"
diff --git a/testing/docker-compose-ipv4.yaml b/testing/docker-compose-ipv4.yaml
index 44e2be20f4..5b294d700d 100644
--- a/testing/docker-compose-ipv4.yaml
+++ b/testing/docker-compose-ipv4.yaml
@@ -1,5 +1,3 @@
-version: "3.7"
-
 services:
   dc1_node_1:
     command: ${SCYLLA_ARGS} --rpc-address 192.168.100.11 --alternator-address 192.168.200.11 --listen-address 192.168.200.11
diff --git a/testing/docker-compose-ipv6.yaml b/testing/docker-compose-ipv6.yaml
index b122b815c4..863b1b9573 100644
--- a/testing/docker-compose-ipv6.yaml
+++ b/testing/docker-compose-ipv6.yaml
@@ -1,5 +1,3 @@
-version: "3.7"
-
 services:
   dc1_node_1:
     command: ${SCYLLA_ARGS} --rpc-address 2001:0DB9:100::11 --alternator-address 2001:0DB9:200::11 --listen-address 2001:0DB9:200::11
diff --git a/testing/docker-compose.yaml b/testing/docker-compose.yaml
index 7a68385c2c..fdef023283 100644
--- a/testing/docker-compose.yaml
+++ b/testing/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3.7"
-
 services:
   dc1_node_1:
     image: scylladb/agent-${SCYLLA_VERSION}