Skip to content

Update dockerfile paths #73

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

Merged
merged 9 commits into from
Mar 31, 2025
Merged

Update dockerfile paths #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c8c1636
Update paths to dockerfiles
hmellor Mar 11, 2025
114a347
temp: download bootstrap from different branch
hmellor Mar 17, 2025
3cfe64d
`dockerfiles/` -> `docker/`
hmellor Mar 17, 2025
c5cc7f1
Fix bootstrap patterns
hmellor Mar 17, 2025
6f89bb4
Merge branch 'main' into update-dockerfile-paths
hmellor Mar 24, 2025
f5a5caa
Revert "temp: download bootstrap from different branch"
hmellor Mar 24, 2025
2694ebf
Add `docker/` to remaining `Dockerfile*` refs
hmellor Mar 24, 2025
e6d56a7
Change branch to test
khluu Mar 25, 2025
72c44e9
Revert branch
khluu Mar 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 6 additions & 11 deletions scripts/ci_aws_bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,23 +60,18 @@ fi

patterns=(
".buildkite/test-pipeline"
"Dockerfile"
"docker/Dockerfile"
"CMakeLists.txt"
"requirements*"
"requirements/common.txt"
"requirements/cuda.txt"
"requirements/build.txt"
"requirements/test.txt"
"setup.py"
"csrc/"
)

ignore_patterns=(
"Dockerfile.rocm"
"Dockerfile.rocm_base"
"requirements-rocm"
"requirements-hpu"
"requirements-openvino"
"requirements-neuron"
"requirements-tpu"
"requirements-xpu"
"requirements-cpu"
"docker/Dockerfile."
)

for file in $file_diff; do
Expand Down
1 change: 1 addition & 0 deletions scripts/pipeline_generator/pipeline_generator_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ def get_build_commands(container_registry: str, buildkite_commit: str, container
"""
docker_build_command = (
f"docker build "
f"--file docker/Dockerfile "
f"--build-arg max_jobs=64 "
f"--build-arg buildkite_commit={buildkite_commit} "
f"--build-arg USE_SCCACHE=1 "
Expand Down
8 changes: 4 additions & 4 deletions scripts/test-template-aws.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ steps:
echo "Image found"
exit 0
fi
- "docker build --build-arg max_jobs=16 --build-arg buildkite_commit=$BUILDKITE_COMMIT --build-arg USE_SCCACHE=1 --tag {{ docker_image }} --target test --progress plain ."
- "docker build --file docker/Dockerfile --build-arg max_jobs=16 --build-arg buildkite_commit=$BUILDKITE_COMMIT --build-arg USE_SCCACHE=1 --tag {{ docker_image }} --target test --progress plain ."
- "docker push {{ docker_image }}"
env:
DOCKER_BUILDKIT: "1"
Expand Down Expand Up @@ -65,7 +65,7 @@ steps:
echo "Image found"
exit 0
fi
- "docker build --build-arg max_jobs=16 --build-arg buildkite_commit=$BUILDKITE_COMMIT --build-arg USE_SCCACHE=1 --build-arg CUDA_VERSION=12.1.0 --tag {{ docker_image_cu121 }} --target test --progress plain ."
- "docker build --file docker/Dockerfile --build-arg max_jobs=16 --build-arg buildkite_commit=$BUILDKITE_COMMIT --build-arg USE_SCCACHE=1 --build-arg CUDA_VERSION=12.1.0 --tag {{ docker_image_cu121 }} --target test --progress plain ."
- "docker push {{ docker_image_cu121 }}"
env:
DOCKER_BUILDKIT: "1"
Expand Down Expand Up @@ -99,7 +99,7 @@ steps:
echo "Image found"
exit 0
fi
- "docker build --build-arg max_jobs=16 --build-arg buildkite_commit=$BUILDKITE_COMMIT --build-arg USE_SCCACHE=1 --build-arg CUDA_VERSION=11.8.0 --tag {{ docker_image_cu118 }} --target test --progress plain ."
- "docker build --file docker/Dockerfile --build-arg max_jobs=16 --build-arg buildkite_commit=$BUILDKITE_COMMIT --build-arg USE_SCCACHE=1 --build-arg CUDA_VERSION=11.8.0 --tag {{ docker_image_cu118 }} --target test --progress plain ."
- "docker push {{ docker_image_cu118 }}"
env:
DOCKER_BUILDKIT: "1"
Expand Down Expand Up @@ -253,7 +253,7 @@ steps:
soft_fail: true
commands:
# Handle the introduction of test target in Dockerfile.rocm
- "grep -i 'from base as test' Dockerfile.rocm && docker build --build-arg max_jobs=16 --tag {{ docker_image_amd }} -f Dockerfile.rocm --target test --progress plain . || docker build --build-arg max_jobs=16 --tag {{ docker_image_amd }} -f Dockerfile.rocm --progress plain ."
- "grep -i 'from base as test' docker/Dockerfile.rocm && docker build --build-arg max_jobs=16 --tag {{ docker_image_amd }} -f docker/Dockerfile.rocm --target test --progress plain . || docker build --build-arg max_jobs=16 --tag {{ docker_image_amd }} -f docker/Dockerfile.rocm --progress plain ."
- "docker push {{ docker_image_amd }}"
key: "amd-build"
env:
Expand Down
4 changes: 2 additions & 2 deletions scripts/test-template-fastcheck.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ steps:
echo "Image found"
exit 0
fi
- "docker build --build-arg max_jobs=16 --build-arg buildkite_commit=$BUILDKITE_COMMIT --build-arg USE_SCCACHE=1 --tag {{ docker_image }} --target test --progress plain ."
- "docker build --file docker/Dockerfile --build-arg max_jobs=16 --build-arg buildkite_commit=$BUILDKITE_COMMIT --build-arg USE_SCCACHE=1 --tag {{ docker_image }} --target test --progress plain ."
- "docker push {{ docker_image }}"
env:
DOCKER_BUILDKIT: "1"
Expand Down Expand Up @@ -267,7 +267,7 @@ steps:
depends_on: block-amd-build
soft_fail: true
commands:
- "grep -i 'from base as test' Dockerfile.rocm && docker build --build-arg max_jobs=16 --tag {{ docker_image_amd }} -f Dockerfile.rocm --target test --progress plain . || docker build --build-arg max_jobs=16 --tag {{ docker_image_amd }} -f Dockerfile.rocm --progress plain ."
- "grep -i 'from base as test' Dockerfile.rocm && docker build --build-arg max_jobs=16 --tag {{ docker_image_amd }} -f docker/Dockerfile.rocm --target test --progress plain . || docker build --build-arg max_jobs=16 --tag {{ docker_image_amd }} -f docker/Dockerfile.rocm --progress plain ."
- "docker push {{ docker_image_amd }}"
key: amd-build
env:
Expand Down