From dab0d8f2cd603dfd9ec3e03c2eb0436df574c446 Mon Sep 17 00:00:00 2001
From: Giovanni Toraldo <giovanni.toraldo@hyland.com>
Date: Thu, 1 Aug 2024 15:47:23 +0200
Subject: [PATCH 1/3] rename docker-compose to docker compose

---
 .../dbp-charts/verify-compose/docker_compose.sh     | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/actions/dbp-charts/verify-compose/docker_compose.sh b/.github/actions/dbp-charts/verify-compose/docker_compose.sh
index 1909751ad..15a26b4cc 100755
--- a/.github/actions/dbp-charts/verify-compose/docker_compose.sh
+++ b/.github/actions/dbp-charts/verify-compose/docker_compose.sh
@@ -2,6 +2,7 @@
 
 COMPOSE_FILE=$(basename $COMPOSE_FILE_PATH)
 COMPOSE_PATH=$(dirname $COMPOSE_FILE_PATH)
+COMPOSE_BIN="docker compose"
 alf_port=8080
 
 cd "$COMPOSE_PATH" || {
@@ -9,15 +10,15 @@ cd "$COMPOSE_PATH" || {
   exit 1
 }
 docker info
-docker-compose --version
-docker-compose -f "${COMPOSE_FILE}" config
+$COMPOSE_BIN --version
+$COMPOSE_BIN -f "${COMPOSE_FILE}" config
 echo "Starting Alfresco in docker compose"
-docker-compose ps
+$COMPOSE_BIN ps
 if [ "$COMPOSE_PULL" = "true" ]; then
-  docker-compose -f "${COMPOSE_FILE}" pull --quiet
+  $COMPOSE_BIN -f "${COMPOSE_FILE}" pull --quiet
 fi
 export COMPOSE_HTTP_TIMEOUT=120
-docker-compose -f "${COMPOSE_FILE}" up -d --quiet-pull
+$COMPOSE_BIN -f "${COMPOSE_FILE}" up -d --quiet-pull
 
 WAIT_INTERVAL=1
 COUNTER=0
@@ -78,6 +79,6 @@ docker run -a STDOUT --volume "${PWD}"/test/postman/docker-compose:/etc/newman -
 retVal=$?
 if [ "${retVal}" -ne 0 ]; then
   # show logs
-  docker-compose logs --no-color
+  $COMPOSE_BIN logs --no-color
   exit 1
 fi

From 5e2cc05b608115c5be552b9859cbe6852172af3f Mon Sep 17 00:00:00 2001
From: Giovanni Toraldo <71768+gionn@users.noreply.github.com>
Date: Thu, 1 Aug 2024 16:02:05 +0200
Subject: [PATCH 2/3] version bump

---
 version.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.txt b/version.txt
index 9773998bc..23e595e7b 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-v6.0.0
+v6.0.1

From 4da28efec493c8f2a0ad3d559f0c921ed6712490 Mon Sep 17 00:00:00 2001
From: Giovanni Toraldo <71768+gionn@users.noreply.github.com>
Date: Thu, 1 Aug 2024 16:19:03 +0200
Subject: [PATCH 3/3] Apply suggestions from code review

Co-authored-by: Domenico Sibilio <domenicosibilio@gmail.com>
---
 .github/actions/dbp-charts/verify-compose/docker_compose.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/dbp-charts/verify-compose/docker_compose.sh b/.github/actions/dbp-charts/verify-compose/docker_compose.sh
index 15a26b4cc..898c85d13 100755
--- a/.github/actions/dbp-charts/verify-compose/docker_compose.sh
+++ b/.github/actions/dbp-charts/verify-compose/docker_compose.sh
@@ -10,7 +10,7 @@ cd "$COMPOSE_PATH" || {
   exit 1
 }
 docker info
-$COMPOSE_BIN --version
+$COMPOSE_BIN version
 $COMPOSE_BIN -f "${COMPOSE_FILE}" config
 echo "Starting Alfresco in docker compose"
 $COMPOSE_BIN ps