Skip to content

Commit

Permalink
OPSEXP-2737 Rename docker-compose to docker compose in verify action (#…
Browse files Browse the repository at this point in the history
…703)

Co-authored-by: Domenico Sibilio <[email protected]>
  • Loading branch information
gionn and dsibilio authored Aug 1, 2024
1 parent 61f10e5 commit 0a28a2b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
13 changes: 7 additions & 6 deletions .github/actions/dbp-charts/verify-compose/docker_compose.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,23 @@

COMPOSE_FILE=$(basename $COMPOSE_FILE_PATH)
COMPOSE_PATH=$(dirname $COMPOSE_FILE_PATH)
COMPOSE_BIN="docker compose"
alf_port=8080

cd "$COMPOSE_PATH" || {
echo "Error: docker compose dir not found"
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
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v6.0.0
v6.0.1

0 comments on commit 0a28a2b

Please sign in to comment.