Skip to content

Commit

Permalink
PMM-12811 check the container exit code
Browse files Browse the repository at this point in the history
  • Loading branch information
ademidoff committed Jan 19, 2024
1 parent 8e1d823 commit 62d898b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/managed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,11 @@ jobs:
- name: Initialize CI environment
run: |
# the container workdir is /root/go/src/github.com/percona/pmm
if ! make env-compose-up; then docker logs pmm-server; exit 1; fi
exit_code=$(make env-compose-up)
if [ "$exit_code" -ne 0 ]; then
echo "Failed to start PMM Server, exit code: $exit_code"
docker logs pmm-server
fi
- name: Restore Go build cache
if: ${{ fromJSON(env.DEVCONTAINER_CACHE_ENABLED) }}
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ env-update-image: ## Pull latest dev image

env-compose-up: env-update-image
COMPOSE_PROFILES=$(PROFILES) \
docker compose up --detach --renew-anon-volumes --remove-orphans --wait --wait-timeout 100 --exit-code-from pmm-server
docker compose up --detach --renew-anon-volumes --remove-orphans --wait --wait-timeout 150

env-devcontainer:
docker exec -it --workdir=/root/go/src/github.com/percona/pmm pmm-server .devcontainer/setup.py
Expand Down

0 comments on commit 62d898b

Please sign in to comment.