Skip to content

Commit

Permalink
Add logs target to makefile so that we can avoid all explicit docker-…
Browse files Browse the repository at this point in the history
…compose calls in CI action. Switch it to use make X consistently.
  • Loading branch information
jonasbardino committed Mar 21, 2024
1 parent afe7e84 commit bb3060c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,16 @@ jobs:
make dockerbuild
- name: Start services
run: |
docker-compose up -d
make up
- name: Run tests
run: |
make test
- name: Read docker-compose logs
- name: Read docker compose logs
run: |
docker-compose logs
make logs
- name: Read migrid logs
run: |
tail -n +1 state/log/*
- name: Stop services
run: |
docker-compose down
make down
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,9 @@ dockerclean: initcomposevars
${DOCKER} image prune -f
${DOCKER} builder prune -f || true

logs: initcomposevars
${DOCKER_COMPOSE} logs

dockerpush:
${DOCKER} push $(OWNER)/$(IMAGE)${CONTAINER_TAG}

Expand Down

0 comments on commit bb3060c

Please sign in to comment.