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

Dockercompose to unify all the docker components #132

Merged
merged 7 commits into from
Aug 2, 2024
Merged

Conversation

ctr26
Copy link
Contributor

@ctr26 ctr26 commented Jul 30, 2024

@liviuba

I've made a start on moving the docker-compose file to the root dir. This should improve readability, expandability and fix the context issue.

Also solves the issue of what files are ignored by docker ignore

This context issue is that the api project can't see files from the other projects unless the context is set correctly.

Hope this helps,

@ctr26 ctr26 changed the base branch from main to dev July 31, 2024 11:21
@ctr26 ctr26 changed the base branch from dev to main July 31, 2024 11:21
@ctr26 ctr26 marked this pull request as ready for review July 31, 2024 11:21
@ctr26 ctr26 changed the base branch from main to api_shared_datamodels July 31, 2024 17:15
@ctr26 ctr26 changed the base branch from api_shared_datamodels to main July 31, 2024 17:16
@ctr26 ctr26 changed the base branch from main to api_shared_datamodels July 31, 2024 17:16
@ctr26
Copy link
Contributor Author

ctr26 commented Jul 31, 2024

@liviuba, I rebased on api_shared_datamodels when I maybe shouldn't have as I have commits from other branches in here too. Making this one a draft as a result

@ctr26 ctr26 changed the title Dockercompose [draft] Dockercompose Jul 31, 2024
@ctr26 ctr26 changed the base branch from api_shared_datamodels to main August 1, 2024 10:05
@ctr26 ctr26 changed the base branch from main to api_shared_datamodels August 1, 2024 10:05
@ctr26
Copy link
Contributor Author

ctr26 commented Aug 2, 2024

Fun one,

Just now I tried to rebase my local api_shared_datamodels on this branch and there was a merge conflict because I tried the older docker compose instead of git mv

I then went back into the git history and modified that from a delete and create to a git mv and now there's no rebase merge errors on

git rebase -X ours origin/dockercompose

@ctr26 ctr26 changed the title [draft] Dockercompose Dockercompose to unify all the docker components Aug 2, 2024
@liviuba liviuba self-requested a review August 2, 2024 12:28
Copy link
Contributor

@liviuba liviuba left a comment

Choose a reason for hiding this comment

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

LGTM!

Not sure about the first commit on this branch (7258573) having the same message as an older squashed PR, but no conflicts so assuming nothing is overwritten that it shouldn't


CMD ["poetry", "run", "uvicorn", "--workers", "4", "--port", "8080", "--log-config", "./src/log_config.yml", "--host", "0.0.0.0", "src.app:app"]
CMD ["poetry", "run", "uvicorn", "--workers", "4", "--port", "8080", "--log-config", ".api/src/log_config.yml", "--host", "0.0.0.0", "api.app:app"]
Copy link
Contributor

Choose a reason for hiding this comment

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

Typo for ./api... here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm too good at fixing files in the git history so now I'll never look like I've made a mistake ever again lol

@ctr26 ctr26 merged commit 080610d into main Aug 2, 2024
33 checks passed
@ctr26 ctr26 deleted the dockercompose branch August 2, 2024 14:09
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.

2 participants