Skip to content

Commit 2fcddee

Browse files
[CI] Simplify nightly docker images (#16680)
Have a single docker image created with all the dependencies pre-installed so that it could be used for all internal CI needs for every target. Other workflows should be changed after this is merged and new image is uploaded to the registry.
1 parent 5fb402c commit 2fcddee

File tree

3 files changed

+11
-40
lines changed

3 files changed

+11
-40
lines changed

.github/workflows/sycl-nightly.yml

Lines changed: 6 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ jobs:
242242
body: "Daily build ${{ steps.tag.outputs.TAG }}"
243243
target_commitish: ${{ github.sha }}
244244

245-
ubuntu2204_docker_build_push:
245+
docker_build_push:
246246
if: github.repository == 'intel/llvm'
247247
runs-on: [Linux, build]
248248
permissions:
@@ -254,42 +254,16 @@ jobs:
254254
with:
255255
name: sycl_linux_default
256256
path: devops/
257-
- name: Build and Push Container (with drivers)
257+
- name: Build and Push Container
258258
uses: ./devops/actions/build_container
259259
with:
260260
push: ${{ github.ref_name == 'sycl' }}
261-
file: ubuntu2204_preinstalled
261+
file: nightly
262262
username: ${{ github.repository_owner }}
263263
password: ${{ secrets.GITHUB_TOKEN }}
264264
build-args: |
265265
base_image=ghcr.io/intel/llvm/ubuntu2404_intel_drivers
266-
base_tag=latest
266+
base_tag=alldeps
267267
tags: |
268-
ghcr.io/${{ github.repository }}/sycl_ubuntu2204_nightly:${{ github.sha }}
269-
ghcr.io/${{ github.repository }}/sycl_ubuntu2204_nightly:latest
270-
- name: Build and Push Container (no drivers)
271-
uses: ./devops/actions/build_container
272-
with:
273-
push: ${{ github.ref_name == 'sycl' }}
274-
file: ubuntu2204_preinstalled
275-
username: ${{ github.repository_owner }}
276-
password: ${{ secrets.GITHUB_TOKEN }}
277-
build-args: |
278-
base_image=ghcr.io/intel/llvm/ubuntu2204_base
279-
base_tag=latest
280-
tags: |
281-
ghcr.io/${{ github.repository }}/sycl_ubuntu2204_nightly:no-drivers-${{ github.sha }}
282-
ghcr.io/${{ github.repository }}/sycl_ubuntu2204_nightly:no-drivers
283-
- name: Build and Push Container (Build image)
284-
uses: ./devops/actions/build_container
285-
with:
286-
push: ${{ github.ref_name == 'sycl' }}
287-
file: ubuntu2204_preinstalled
288-
username: ${{ github.repository_owner }}
289-
password: ${{ secrets.GITHUB_TOKEN }}
290-
build-args: |
291-
base_image=ghcr.io/intel/llvm/ubuntu2204_build
292-
base_tag=latest
293-
tags: |
294-
ghcr.io/${{ github.repository }}/sycl_ubuntu2204_nightly:build-${{ github.sha }}
295-
ghcr.io/${{ github.repository }}/sycl_ubuntu2204_nightly:build
268+
ghcr.io/${{ github.repository }}/sycl_ubuntu2404_nightly:${{ github.sha }}
269+
ghcr.io/${{ github.repository }}/sycl_ubuntu2404_nightly:latest

devops/containers/ubuntu2204_preinstalled.Dockerfile renamed to devops/containers/nightly.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ARG base_tag=latest
2-
ARG base_image=ghcr.io/intel/llvm/ubuntu2204_intel_drivers
1+
ARG base_tag=alldeps
2+
ARG base_image=ghcr.io/intel/llvm/ubuntu2404_intel_drivers
33

44
FROM $base_image:$base_tag
55

sycl/doc/developer/DockerBKMs.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,6 @@ development containers:
5353
NVidia/AMD and can be used for building DPC++
5454
compiler from source with all backends enabled or for end-to-end testing
5555
with HIP/CUDA on machines with corresponding GPUs available.
56-
- `devops/containers/sycl_ubuntu2204_nightly`: contains the latest successfully
57-
built nightly build of DPC++ compiler. The Dockerfile comes in three flavors:
58-
with pre-installed Intel drivers (`latest`), without them (`no-drivers`) and
59-
with development kits installed (`build`).
6056

6157
### Ubuntu 24.04-based Dockerfiles
6258

@@ -78,7 +74,8 @@ development containers:
7874
NVidia/AMD and can be used for building DPC++
7975
compiler from source with all backends enabled or for end-to-end testing
8076
with HIP/CUDA on machines with corresponding GPUs available.
81-
77+
- `devops/containers/nightly`: contains the latest successfully
78+
built nightly build of DPC++ compiler.
8279

8380
## Running Docker container interactively
8481

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

202-
The `ubuntu2204_preinstalled.Dockerfile` script expects `llvm_sycl.tar.xz` file
199+
The `nightly.Dockerfile` script expects `llvm_sycl.tar.xz` file
203200
to be present in `devops/` directory.
204201

205202
Containers other than base provide several configurable arguments, the most

0 commit comments

Comments
 (0)