-
Notifications
You must be signed in to change notification settings - Fork 20
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm glad to see this working! I added odds and ends throughout, but my only real request is that we squash these commits. I'm pretty sure that's possible in the merge UI, but git rebase -i HEAD~29
'll do it, too.
command: | | ||
docker create -v /usr/src/app -v /usr/src/app/.venv --name holder python:3.6.2 | ||
docker cp . holder:/usr/src/app | ||
docker start holder |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Very innovative solution, nice work!
.circleci/config.yml
Outdated
- run: | ||
name: run tests | ||
command: | | ||
ls eregs_libs |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this still needed?
.circleci/config.yml
Outdated
ls eregs_libs | ||
docker-compose -f docker-compose-circle.yml run flake8 atf_eregs | ||
docker-compose -f docker-compose-circle.yml run py.test atf_eregs/tests | ||
environment: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not needed this time through, but we should figure out how to run the parser tests, too.
.circleci/config.yml
Outdated
docker-compose -f docker-compose-circle.yml run flake8 atf_eregs | ||
docker-compose -f docker-compose-circle.yml run py.test atf_eregs/tests | ||
environment: | ||
DEBUG: TRUE |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this needed? I think the docker-compose file is setting the DEBUG
value in its containers.
@@ -13,14 +13,14 @@ if [ -n "$DEBUG" ]; then | |||
|
|||
if git diff --exit-code eregs_libs/regulations-site > /dev/null | |||
then | |||
git submodule update eregs_libs/regulations-site | |||
git submodule update --init eregs_libs/regulations-site |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The --init
was added in #494 -- does this need to be rebased, maybe?
persistent_db: | ||
image: postgres:9.4 | ||
volumes_from: | ||
- container:holder |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not for this round, but if the volumes are the only significant change, what do you think about replacing them in a sed
command or similar? That way we wouldn't need to maintain two configurations.
docker-compose.yml
Outdated
entrypoint: ls | ||
command: '' | ||
ports: [] | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm betting this addition wasn't intended?
@cmc333333 Thanks for the comments, there's a bunch of stuff in here that's not final—I had meant to label this I was trying to not maintain two configurations by using docker-compose's I'll rebase before a final PR, as we definitely don't need tens of identical commit messages… |
I moved the rebased commits into another branch and made a new PR. Closing. |
This is a prior version of the config that worked, and I'm breaking it out into its own branch for more testing.