diff --git a/.github/actions/dbp-charts/verify-compose/action.yml b/.github/actions/dbp-charts/verify-compose/action.yml index 7151991dc..56f06d470 100644 --- a/.github/actions/dbp-charts/verify-compose/action.yml +++ b/.github/actions/dbp-charts/verify-compose/action.yml @@ -5,6 +5,10 @@ inputs: description: "full path to docker compose file to test" required: false default: "./docker-compose.yml" + compose_pull: + description: "run docker-compose pull before tests" + required: false + default: "true" docker_username: description: "username for Docker Hub" required: false @@ -43,3 +47,4 @@ runs: shell: bash env: COMPOSE_FILE_PATH: ${{ inputs.compose_file_path }} + COMPOSE_PULL: ${{ inputs.compose_pull }} diff --git a/.github/actions/dbp-charts/verify-compose/docker_compose.sh b/.github/actions/dbp-charts/verify-compose/docker_compose.sh index 16da186f9..1909751ad 100755 --- a/.github/actions/dbp-charts/verify-compose/docker_compose.sh +++ b/.github/actions/dbp-charts/verify-compose/docker_compose.sh @@ -13,7 +13,9 @@ docker-compose --version docker-compose -f "${COMPOSE_FILE}" config echo "Starting Alfresco in docker compose" docker-compose ps -docker-compose -f "${COMPOSE_FILE}" pull --quiet +if [ "$COMPOSE_PULL" = "true" ]; then + docker-compose -f "${COMPOSE_FILE}" pull --quiet +fi export COMPOSE_HTTP_TIMEOUT=120 docker-compose -f "${COMPOSE_FILE}" up -d --quiet-pull diff --git a/version.txt b/version.txt index e1c0d594b..c92d06d63 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -v5.33.0 +v5.34.0