Skip to content

Move dockerfiles into their own directory #14549

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 11 commits into from
Mar 31, 2025
Merged

Move dockerfiles into their own directory #14549

merged 11 commits into from
Mar 31, 2025

Conversation

@hmellor
Copy link
Member

@hmellor hmellor commented Mar 10, 2025

Follow up to #12547 to move the dockerfiles to their own directory too.

@hmellor hmellor requested a review from tlrmchlsmth as a code owner March 10, 2025 11:02
@github-actions
Copy link

👋 Hi! Thank you for contributing to the vLLM project.

💬 Join our developer Slack at https://slack.vllm.ai to discuss your PR in #pr-reviews, coordinate on features in #feat- channels, or join special interest groups in #sig- channels.

Just a reminder: PRs would not trigger full CI run by default. Instead, it would only run fastcheck CI which starts running only a small and essential subset of CI tests to quickly catch errors. You can run other CI tests on top of those by going to your fastcheck build on Buildkite UI (linked in the PR checks section) and unblock them. If you do not have permission to unblock, ping simon-mo or khluu to add you in our Buildkite org.

Once the PR is approved and ready to go, your PR reviewer(s) can run CI to test the changes comprehensively before merging.

To run CI, PR reviewers can either: Add ready label to the PR or enable auto-merge.

🚀

@mergify mergify bot added documentation Improvements or additions to documentation ci/build labels Mar 10, 2025
@hmellor
Move Dockerfiles to dockerfiles/
d058de5 
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
@mergify
Copy link

mergify bot commented Mar 11, 2025

This pull request has merge conflicts that must be resolved before it can be
merged. Please rebase the PR, @hmellor.

https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork

@mergify mergify bot added the needs-rebase label Mar 11, 2025
hmellor added a commit to vllm-project/ci-infra that referenced this pull request Mar 11, 2025
@hmellor
Update paths to dockerfiles
c8c1636 
Should follow vllm-project/vllm#14549.

Also updates the patternt for requirements in bootstrap script.

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
@hmellor
Copy link
Member Author

hmellor commented Mar 17, 2025

Test build here https://buildkite.com/vllm/ci/builds/15714/canvas?sid=0195a40e-4e2e-43ad-bcb0-32abe71cc369

@hmellor
Merge branch 'main' into move-dockerfiles
c12a569 
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
@mergify mergify bot removed the needs-rebase label Mar 17, 2025
jeejeelee
jeejeelee reviewed Mar 17, 2025
View reviewed changes
hmellor added 3 commits March 17, 2025 15:44
@hmellor
dockerfiles/ -> docker/
957a72c 
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
@hmellor
Merge branch 'main' into move-dockerfiles
4908526 
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
@hmellor
Fix moved TPU test
8f22b96 
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
@hmellor hmellor mentioned this pull request Mar 24, 2025
Merged
@hmellor
Fix new dockerfile references
7e0dbf7 
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
tlrmchlsmth
tlrmchlsmth reviewed Mar 24, 2025
View reviewed changes
@hmellor
Respond to comment
0ed252c 
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
@mergify
Copy link

mergify bot commented Mar 25, 2025

This pull request has merge conflicts that must be resolved before it can be
merged. Please rebase the PR, @hmellor.

https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork

@mergify mergify bot added the needs-rebase label Mar 25, 2025
@mergify mergify bot added tpu Related to Google TPUs and removed needs-rebase labels Mar 25, 2025
@mergify
Copy link

mergify bot commented Mar 27, 2025

This pull request has merge conflicts that must be resolved before it can be
merged. Please rebase the PR, @hmellor.

https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork

@mergify mergify bot added the needs-rebase label Mar 27, 2025
@hmellor
Merge branch 'main' into move-dockerfiles
73affcd 
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
@mergify mergify bot removed needs-rebase tpu Related to Google TPUs labels Mar 27, 2025
@jeejeelee jeejeelee mentioned this pull request Mar 28, 2025
Closed
hmellor added 2 commits March 31, 2025 14:27
@hmellor
Merge branch 'main' into move-dockerfiles
3bc0610 
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
@hmellor
Fix some more dockerfile references
cb929c3 
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
@simon-mo simon-mo merged commit e6e3c55 into vllm-project:main Mar 31, 2025
59 of 63 checks passed
khluu added a commit to vllm-project/ci-infra that referenced this pull request Mar 31, 2025
@hmellor @khluu
Update dockerfile paths (#73)
3fb2dd0 
* Update paths to dockerfiles

Should follow vllm-project/vllm#14549.

Also updates the patternt for requirements in bootstrap script.

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>

* temp: download bootstrap from different branch

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>

* `dockerfiles/` -> `docker/`

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>

* Fix bootstrap patterns

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>

* Revert "temp: download bootstrap from different branch"

This reverts commit 114a347.

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>

* Add `docker/` to remaining `Dockerfile*` refs

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>

* Change branch to test

* Revert branch

---------

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
Co-authored-by: Kevin H. Luu <kevin@anyscale.com>
@hmellor hmellor deleted the move-dockerfiles branch March 31, 2025 22:18
@tlrmchlsmth tlrmchlsmth mentioned this pull request Apr 1, 2025
Merged
@peteski22 peteski22 mentioned this pull request Apr 1, 2025
Merged
4 tasks
Alex4210987 pushed a commit to LeiWang1999/vllm-bitblas that referenced this pull request Apr 5, 2025
@hmellor @Alex4210987
Move dockerfiles into their own directory (vllm-project#14549)
c2e45eb 
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
Signed-off-by: xinyuxiao <xinyuxiao2024@gmail.com>
lulmer pushed a commit to lulmer/vllm that referenced this pull request Apr 7, 2025
@hmellor @lulmer
Move dockerfiles into their own directory (vllm-project#14549)
84aed20 
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
Signed-off-by: Louis Ulmer <ulmerlouis@gmail.com>
@ckhordiasma ckhordiasma mentioned this pull request Apr 17, 2025
Closed
lk-chen pushed a commit to lk-chen/vllm that referenced this pull request Apr 29, 2025
@hmellor @lk-chen
Move dockerfiles into their own directory (vllm-project#14549)
10f51e0 
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
shreyankg pushed a commit to shreyankg/vllm that referenced this pull request May 3, 2025
@hmellor @shreyankg
Move dockerfiles into their own directory (vllm-project#14549)
ee4ea25 
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
RichardoMrMu pushed a commit to RichardoMrMu/vllm that referenced this pull request May 12, 2025
@hmellor
Move dockerfiles into their own directory (vllm-project#14549)
038c4fa 
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
Signed-off-by: Mu Huai <tianbowen.tbw@antgroup.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tlrmchlsmth tlrmchlsmth tlrmchlsmth left review comments

@jeejeelee jeejeelee jeejeelee left review comments

@khluu khluu khluu approved these changes

Assignees

No one assigned

Labels

ci/build documentation Improvements or additions to documentation

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@hmellor @tlrmchlsmth @jeejeelee @khluu @simon-mo