Skip to content

[CI] Simplify Docker containers#21175

Merged
sarnex merged 5 commits intointel:syclfrom
sarnex:fixdocker
Feb 2, 2026
Merged

[CI] Simplify Docker containers#21175
sarnex merged 5 commits intointel:syclfrom
sarnex:fixdocker

Conversation

@sarnex
Copy link
Contributor

@sarnex sarnex commented Jan 29, 2026

Get rid of the base container and the current latest container and move the current intel_drivers alldeps container to latest.

Nobody was using the base container directly, and it's only used in one place transitively, the UR liboffload workflow, through the intel_drivers:latest tag.

Lets just simply everything.

This PR isn't updating any workflows because we need the containers in this PR to be published first.

runs-on: [Linux, build]
container:
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:alldeps
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest

Check failure

Code scanning / zizmor

unpinned image references

unpinned image references
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Gone from PR

packages: read
container:
image: ${{ inputs.image || 'ghcr.io/intel/llvm/ubuntu2404_intel_drivers:alldeps'}}
image: ${{ inputs.image || 'ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest'}}

Check failure

Code scanning / zizmor

unpinned image references

unpinned image references
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Gone from PR

runs-on: [ "Linux", "build" ]
container:
image: 'ghcr.io/intel/llvm/ubuntu2404_base'
image: 'ghcr.io/intel/llvm/ubuntu2404_build'

Check failure

Code scanning / zizmor

unpinned image references

unpinned image references
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Gone from PR

Signed-off-by: Nick Sarnie <nick.sarnie@intel.com>
@sarnex sarnex marked this pull request as ready for review January 29, 2026 22:08
@sarnex sarnex requested review from a team as code owners January 29, 2026 22:08

- `devops/containers/ubuntu2204_base`: contains basic environment
setup for building DPC++ compiler from source.
- `devops/containers/ubuntu2204_intel_drivers`: contains everything from the
Copy link
Contributor

Choose a reason for hiding this comment

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

nit
should we rename it to be ubuntu2204_all_gpu_drivers?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah good idea, let me just name it ubuntu2204_gpu_drivers

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Actually thinking now, build has the amd/nvidia drivers and only this one has the intel one, so i think the current naming makes sense

dependencies.json. The drivers are tested/validated everytime we upgrade
the driver. Also includes the development kits for NVidia/AMD.
The drivers are installed as it is, not tested or validated.
- `devops/containers/ubuntu2204_build`: has development kits installed for
Copy link
Contributor

Choose a reason for hiding this comment

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

nit
should we describe ubuntu2204_build first, since we refer to it in ubuntu2204_intel_drivers and then in description of ubuntu2204_intel_drivers we can avoid repeating what we already described for build image.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Makes sense, thanks. I just lazily deleted what was there :)

other drivers are downloaded from release/tag and saved in dependencies.json.
* `alldeps`: Includes the same Intel drivers as `latest`, as well as the
development kits for NVidia/AMD from the `ubuntu2404_build` Dockerfile.
build Dockerfile + pre-installed Intel drivers.
Copy link
Contributor

Choose a reason for hiding this comment

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

nit. same here.

Copy link
Contributor

@YuriPlyakhin YuriPlyakhin left a comment

Choose a reason for hiding this comment

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

LGTM. few nits.

Signed-off-by: Nick Sarnie <nick.sarnie@intel.com>
Copy link
Contributor

@lukaszstolarczuk lukaszstolarczuk left a comment

Choose a reason for hiding this comment

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

lgtm 👍

Comment on lines 50 to 51
the driver. Also includes the development kits for NVidia/AMD.
The drivers are installed as it is, not tested or validated.
Copy link
Contributor

Choose a reason for hiding this comment

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

nit - removed duplication

Suggested change
the driver. Also includes the development kits for NVidia/AMD.
The drivers are installed as it is, not tested or validated.
the driver. NVidia/AMD drivers are installed as it is, not tested or validated.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

nevermind, you're right, thanks

Signed-off-by: Nick Sarnie <nick.sarnie@intel.com>
Signed-off-by: Nick Sarnie <nick.sarnie@intel.com>
Signed-off-by: Nick Sarnie <nick.sarnie@intel.com>
@KornevNikita
Copy link
Contributor

For some reason trivy ignores the ignorefile. Feel free to ignore, I'll fix it

@sarnex
Copy link
Contributor Author

sarnex commented Feb 2, 2026

@uditagarwal97 Mind taking a final look at this one? Thanks

Copy link
Contributor

@uditagarwal97 uditagarwal97 left a comment

Choose a reason for hiding this comment

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

LGTM

@sarnex
Copy link
Contributor Author

sarnex commented Feb 2, 2026

Thanks! After the containers build I will make a follow-up PR that actually uses these new containers.

@sarnex sarnex merged commit 466d0d5 into intel:sycl Feb 2, 2026
55 of 61 checks passed
sarnex added a commit that referenced this pull request Feb 3, 2026
Start using the new container labels added in
#21175

Signed-off-by: Nick Sarnie <nick.sarnie@intel.com>
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.

5 participants