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

Add bootstrap installer and a Docker controller Makefile #936

Merged
merged 6 commits into from
Jun 28, 2022
Merged

Conversation

dshemetov
Copy link
Contributor

@dshemetov dshemetov commented Jun 18, 2022

Prerequisites:

  • Unless it is a documentation hotfix it should be merged against the dev branch
  • Branch is up-to-date with the branch to be merged with, i.e. dev
  • Build is successful
  • Code is cleaned up and formatted

Summary

I had some local devtools laying around and figured I would try merging them with #752. The differences are

  • use a Makefile controller for the script, in some ways cleaner than a bash script and makes extensions easy
  • add a --pdb flag option to the testing command
  • simplify the container logfile location
  • add in a .dockerignore file to control the container context
  • bug fix install.sh to reintroduce deprecated, though not yet removed, dependencies

Just figured I would see if I could help push this work along. Though I didn't add much, maybe consider it a thorough review, so we can get closer to merging? After this, we can really simplify our dev docs and speed up engineer onboarding time.

@krivard
Copy link
Contributor

krivard commented Jun 23, 2022

Did you rebase commits from another branch? I merged #752 earlier this week

Copy link

@xavier-xia-99 xavier-xia-99 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Everything works for setting up the environment from a new directory to testing.

Would also just love to include the additional flags when running make test in the markdown!

* combine with Katie and Xavier's work in epidata-refresh.sh
* simplify directory structure using .dockerignore
* add in missing dependencies to install.sh
* add in changes reviews from Xavier's review
@dshemetov
Copy link
Contributor Author

dshemetov commented Jun 23, 2022

I rebased to dev and added the extra examples @xavier-xia-99.

@dshemetov dshemetov requested a review from xavier-xia-99 June 23, 2022 18:47
xavier-xia-99
xavier-xia-99 previously approved these changes Jun 23, 2022
Copy link

@xavier-xia-99 xavier-xia-99 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All seems good now! Thank you!

Copy link
Contributor

@krivard krivard left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great work! Changes:

  • Be consistent about whether CWD is specified or not (& decide if it's even needed)
  • Double-check uses of @ to hide output
  • Beware creating a neverending output file
  • Probably don't put a random Makefile on someone's filesystem
  • Verify if all prepandemic delphi packages are really needed

* bring driver back
* remove docker-logs dir
* remove unneeded $(CWD) usage
* don't infinitely append to a test log file
@dshemetov dshemetov requested a review from krivard June 27, 2022 18:39
@dshemetov
Copy link
Contributor Author

Going to leave the refactor discussions unresolved so they're easier to find later.

@krivard
Copy link
Contributor

krivard commented Jun 27, 2022

Going to leave the refactor discussions unresolved so they're easier to find later.

Oh sorry, I resolved them. They're listed in issues and each one links back to this PR in the relevant thread for future discussion purposes.

@dshemetov dshemetov requested a review from krivard June 27, 2022 21:42
Copy link
Contributor

@krivard krivard left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants