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.

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

Hotfix/make erd docker login #3226

Merged
merged 11 commits into from
Oct 16, 2024
6 changes: 6 additions & 0 deletions .circleci/build-and-test/workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@
- /^release.*/
requires:
- secrets-check
- make_erd: # from ../util folder
filters:
branches:
only:
- develop
- master

build-and-test-backend:
when: << pipeline.parameters.build_and_test_backend >>
Expand Down
5 changes: 5 additions & 0 deletions .circleci/util/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
steps:
- checkout
- docker-compose-check
- docker-login
- run:
name: Run graph_models
command: |
Expand All @@ -13,5 +14,9 @@
fi
docker-compose run --rm web bash -c \
"./manage.py graph_models -a -g -o tdp_erd.png"
if [[ ! -f tdp_erd.png ]]; then
echo "Entity Relationship Diagram not found."
exit 1
fi
- store_artifacts:
path: tdrs-backend/tdp_erd.png
2 changes: 1 addition & 1 deletion tdrs-backend/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ services:
- ELASTICSEARCH_LOG_INDEX_SLOW_LEVEL
volumes:
- .:/tdpapp
- logs:/tdpapp
- logs:/tmp
image: tdp-backend
build: .
command: >
Expand Down
2 changes: 2 additions & 0 deletions tdrs-backend/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ omit =
tdpservice/settings/production.py
tdpservice/settings/staging.py
tdpservice/wsgi.py
tdpservice/scheduling/*
andrew-jameson marked this conversation as resolved.
Show resolved Hide resolved
*test*
*migrations*

Expand All @@ -18,6 +19,7 @@ omit =
tdpservice/settings/production.py
tdpservice/settings/staging.py
tdpservice/wsgi.py
tdpservice/scheduling/*
*test*
*migrations*

Expand Down
Loading