From d65f0fc2b69e36a720fb7b43bf3c1f7a89926647 Mon Sep 17 00:00:00 2001
From: Aleksandra Onych <aleksandra.onych@hyland.com>
Date: Wed, 10 Jul 2024 10:03:32 +0200
Subject: [PATCH] [ACS-8352] Migrate to docker compose v2 (#1577)

---
 dev/README.md                | 8 ++++----
 dev/aliases                  | 6 +++---
 scripts/dev/start-compose.sh | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dev/README.md b/dev/README.md
index e87a4a6eb..d2f8e82ac 100644
--- a/dev/README.md
+++ b/dev/README.md
@@ -66,9 +66,9 @@ The repository code will need to talk to other ACS components, such as a databas
 The simplest way to create these, is to use the `docker-compose.yml` file in the `dev` directory.
 ~~~
 # The `envUp` alias is the same as the following commands. Run these in a new terminal session, or add a `-d` flag to
-the `docker-compose` command.
+the `docker compose` command.
 cd acs-community-packaging
-docker-compose -f dev/docker-compose.yml up
+docker compose -f dev/docker-compose.yml up
 Creating dev_activemq_1           ... done
 Creating dev_solr6_1              ... done
 Creating dev_postgres_1           ... done
@@ -121,12 +121,12 @@ mvn install -Prun,withShare -rf dev-acs-amps-overlay
 When finished, kill the tomcat instance and stop the Docker instances. You will normally also
 remove the Docker containers, as you will need a clean database if you are going to issue
 another `mvn clean install` command. If you started `docker-compose` in a separate terminal session,
-simply use `^C` or if you used a `-d` flag, use `docker-compose -f dev/docker-compose.yml stop`.
+simply use `^C` or if you used a `-d` flag, use `docker compose -f dev/docker-compose.yml stop`.
 ~~~
 ^C
 ... Stopped 'sysAdmin' subsystem, ID: [sysAdmin, default]
 
-docker-compose -f dev/docker-compose.yml rm
+docker compose -f dev/docker-compose.yml rm
 Going to remove dev_transform-core-aio_1, dev_transform-router_1, dev_solr6_1, dev_postgres_1, dev_activemq_1, dev_shared-file-store_1
 Are you sure? [yN] y
 Removing dev_transform-core-aio_1 ... done
diff --git a/dev/aliases b/dev/aliases
index 0102a3449..2edeb5321 100755
--- a/dev/aliases
+++ b/dev/aliases
@@ -65,6 +65,6 @@ alias comXS='comS  && comP'
 alias     drm='docker rm -f $(docker ps -q)'
 alias     arm='rm -rf `find . -name alf_data`'
 alias   envUp='./acs-community-packaging/scripts/dev/start-compose.sh'
-alias envStop='docker-compose -f acs-community-packaging/dev/docker-compose.yml stop'
-alias envKill='docker-compose -f acs-community-packaging/dev/docker-compose.yml kill'
-alias   envRm='docker-compose -f acs-community-packaging/dev/docker-compose.yml rm'
+alias envStop='docker compose -f acs-community-packaging/dev/docker-compose.yml stop'
+alias envKill='docker compose -f acs-community-packaging/dev/docker-compose.yml kill'
+alias   envRm='docker compose -f acs-community-packaging/dev/docker-compose.yml rm'
diff --git a/scripts/dev/start-compose.sh b/scripts/dev/start-compose.sh
index 13159df42..0c84e530e 100755
--- a/scripts/dev/start-compose.sh
+++ b/scripts/dev/start-compose.sh
@@ -2,4 +2,4 @@ set -x
 export TRANSFORMERS_TAG=$(mvn -f acs-community-packaging/pom.xml help:evaluate -Dexpression=dependency.alfresco-transform-core.version -q -DforceStdout)
 
 # .env files are picked up from project directory correctly on docker-compose 1.23.0+
-docker-compose -f acs-community-packaging/dev/docker-compose.yml up
\ No newline at end of file
+docker compose -f acs-community-packaging/dev/docker-compose.yml up
\ No newline at end of file