Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OPSEXP-2737 Rename docker-compose to docker compose in verify action #703

Merged
merged 3 commits into from
Aug 1, 2024
Merged

OPSEXP-2737 Rename docker-compose to docker compose in verify action #703

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dab0d8f
rename docker-compose to docker compose
gionn Aug 1, 2024
5e2cc05
version bump
gionn Aug 1, 2024
4da28ef
Apply suggestions from code review
gionn Aug 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions .github/actions/dbp-charts/verify-compose/docker_compose.sh
View file
Open in desktop
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
gionn marked this conversation as resolved.
Show resolved Hide resolved
$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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v6.0.0
v6.0.1
Loading