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

Simplify Makefile #503

Merged
merged 1 commit into from
Mar 21, 2023
Merged

Simplify Makefile #503

merged 1 commit into from
Mar 21, 2023

Conversation

JosephMarinier
Copy link
Contributor

Description:

  • COMPOSE_EXT used to overwrite the -f docker-compose.yml by specifying a second -f docker-compose-gpu.yml, which (fortunately) made docker-compose "forget" about the first file. This undocumented behavior is not straightforward and makes our Makefile confusing. I propose making COMPOSE_EXT only handle the -gpu part of the file name.
  • When running docker-compose, a message suggests using docker compose instead.

Checklist:

You should check all boxes before the PR is ready. If a box does not apply, check it to acknowledge it.

  • ISSUE NUMBER. You linked the issue number (Ex: Resolve #XXX).
  • PRE-COMMIT. You ran pre-commit on all commits, or else, you
    ran pre-commit run --all-files at the end.
  • USER CHANGES. The changes are added to CHANGELOG.md and the documentation, if they impact
    our users.
  • DEV CHANGES.
    • Update the documentation if this PR changes how to develop/launch on the app.
    • Update the README files and our wiki for any big design decisions, if relevant.
    • Add unit tests, docstrings, typing and comments for complex sections.

- `COMPOSE_EXT` used to overwrite the `-f docker-compose.yml` by specifying a second `-f docker-compose-gpu.yml`, which (fortunately) made `docker-compose` "forget" about the first file. This undocumented behavior is not straightforward and makes our `Makefile` confusing. I propose making `COMPOSE_EXT` only handle the `-gpu` part of the file name.
- Calling `docker-compose` suggests to use `docker compose` instead.
@JosephMarinier JosephMarinier self-assigned this Mar 21, 2023
Copy link
Contributor

@gabegma gabegma left a comment

Choose a reason for hiding this comment

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

Ya, great!

@JosephMarinier JosephMarinier merged commit 7e2fcb0 into main Mar 21, 2023
@JosephMarinier JosephMarinier deleted the joseph/simplify-makefile branch March 21, 2023 16:29
JosephMarinier added a commit that referenced this pull request Mar 21, 2023
JosephMarinier added a commit that referenced this pull request Mar 22, 2023
This reverts commit 7e2fcb0.

Only keeping `docker compose` instead of `docker-compose`.
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.

None yet

2 participants