Skip to content

[CI] Simplify nightly docker images #16680

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 1 commit into from
Jan 17, 2025
Merged

[CI] Simplify nightly docker images #16680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 6 additions & 32 deletions .github/workflows/sycl-nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ jobs:
body: "Daily build ${{ steps.tag.outputs.TAG }}"
target_commitish: ${{ github.sha }}

ubuntu2204_docker_build_push:
docker_build_push:
if: github.repository == 'intel/llvm'
runs-on: [Linux, build]
permissions:
Expand All @@ -254,42 +254,16 @@ jobs:
with:
name: sycl_linux_default
path: devops/
- name: Build and Push Container (with drivers)
- name: Build and Push Container
uses: ./devops/actions/build_container
with:
push: ${{ github.ref_name == 'sycl' }}
file: ubuntu2204_preinstalled
file: nightly
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
build-args: |
base_image=ghcr.io/intel/llvm/ubuntu2404_intel_drivers
base_tag=latest
base_tag=alldeps
tags: |
ghcr.io/${{ github.repository }}/sycl_ubuntu2204_nightly:${{ github.sha }}
ghcr.io/${{ github.repository }}/sycl_ubuntu2204_nightly:latest
- name: Build and Push Container (no drivers)
uses: ./devops/actions/build_container
with:
push: ${{ github.ref_name == 'sycl' }}
file: ubuntu2204_preinstalled
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
build-args: |
base_image=ghcr.io/intel/llvm/ubuntu2204_base
base_tag=latest
tags: |
ghcr.io/${{ github.repository }}/sycl_ubuntu2204_nightly:no-drivers-${{ github.sha }}
ghcr.io/${{ github.repository }}/sycl_ubuntu2204_nightly:no-drivers
- name: Build and Push Container (Build image)
uses: ./devops/actions/build_container
with:
push: ${{ github.ref_name == 'sycl' }}
file: ubuntu2204_preinstalled
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
build-args: |
base_image=ghcr.io/intel/llvm/ubuntu2204_build
base_tag=latest
tags: |
ghcr.io/${{ github.repository }}/sycl_ubuntu2204_nightly:build-${{ github.sha }}
ghcr.io/${{ github.repository }}/sycl_ubuntu2204_nightly:build
ghcr.io/${{ github.repository }}/sycl_ubuntu2404_nightly:${{ github.sha }}
ghcr.io/${{ github.repository }}/sycl_ubuntu2404_nightly:latest
4 changes: 2 additions & 2 deletions ...ainers/ubuntu2204_preinstalled.Dockerfile → devops/containers/nightly.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG base_tag=latest
ARG base_image=ghcr.io/intel/llvm/ubuntu2204_intel_drivers
ARG base_tag=alldeps
ARG base_image=ghcr.io/intel/llvm/ubuntu2404_intel_drivers

FROM $base_image:$base_tag

Expand Down
9 changes: 3 additions & 6 deletions sycl/doc/developer/DockerBKMs.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,6 @@ development containers:
NVidia/AMD and can be used for building DPC++
compiler from source with all backends enabled or for end-to-end testing
with HIP/CUDA on machines with corresponding GPUs available.
- `devops/containers/sycl_ubuntu2204_nightly`: contains the latest successfully
built nightly build of DPC++ compiler. The Dockerfile comes in three flavors:
with pre-installed Intel drivers (`latest`), without them (`no-drivers`) and
with development kits installed (`build`).

### Ubuntu 24.04-based Dockerfiles

Expand All @@ -78,7 +74,8 @@ development containers:
NVidia/AMD and can be used for building DPC++
compiler from source with all backends enabled or for end-to-end testing
with HIP/CUDA on machines with corresponding GPUs available.

- `devops/containers/nightly`: contains the latest successfully
built nightly build of DPC++ compiler.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
built nightly build of DPC++ compiler.
built nightly build of DPC++ compiler, along with `latest` Intel drivers and NVidia/AMD development kits (same as `alldeps`).

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've done that on purpose. I'm planning to fuse tags for the base images as well, so that we'll only have 2204/2404/nightly images and once done that clarification will become irrelevant and even confusing.

Copy link
Contributor

Choose a reason for hiding this comment

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

Sure, seems reasonable to me.


## Running Docker container interactively

Expand Down Expand Up @@ -199,7 +196,7 @@ Docker containers can be built with the following command:
docker build -f path/to/devops/containers/file.Dockerfile path/to/devops/
```

The `ubuntu2204_preinstalled.Dockerfile` script expects `llvm_sycl.tar.xz` file
The `nightly.Dockerfile` script expects `llvm_sycl.tar.xz` file
to be present in `devops/` directory.

Containers other than base provide several configurable arguments, the most
Expand Down
Loading