From cdf70db0d60b7969d56aaabf4e266484e4819d54 Mon Sep 17 00:00:00 2001 From: Ettore Di Giacinto Date: Fri, 4 Jul 2025 18:48:53 +0200 Subject: [PATCH 1/2] chore(deps): switch to ubuntu 24.04 Signed-off-by: Ettore Di Giacinto --- .github/workflows/backend.yml | 54 ++++++++++----------- .github/workflows/generate_grpc_cache.yaml | 2 +- .github/workflows/generate_intel_image.yaml | 2 +- .github/workflows/image-pr.yml | 10 ++-- .github/workflows/image.yml | 16 +++--- Dockerfile | 2 +- Dockerfile.aio | 2 +- Makefile | 6 +-- backend/Dockerfile.go | 2 +- backend/Dockerfile.python | 2 +- docker-compose.yaml | 2 +- 11 files changed, 50 insertions(+), 50 deletions(-) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index 72bbbf05ef8c..36b6bf2843f4 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -46,7 +46,7 @@ jobs: tag-latest: 'true' tag-suffix: '-gpu-nvidia-cuda-11-rerankers' runs-on: 'ubuntu-latest' - base-image: "ubuntu:22.04" + base-image: "ubuntu:24.04" backend: "rerankers" dockerfile: "./backend/Dockerfile.python" context: "./backend" @@ -57,7 +57,7 @@ jobs: tag-latest: 'true' tag-suffix: '-gpu-nvidia-cuda-11-vllm' runs-on: 'ubuntu-latest' - base-image: "ubuntu:22.04" + base-image: "ubuntu:24.04" backend: "vllm" dockerfile: "./backend/Dockerfile.python" context: "./backend" @@ -68,7 +68,7 @@ jobs: tag-latest: 'true' tag-suffix: '-gpu-nvidia-cuda-11-transformers' runs-on: 'ubuntu-latest' - base-image: "ubuntu:22.04" + base-image: "ubuntu:24.04" backend: "transformers" dockerfile: "./backend/Dockerfile.python" context: "./backend" @@ -79,7 +79,7 @@ jobs: tag-latest: 'true' tag-suffix: '-gpu-nvidia-cuda-11-diffusers' runs-on: 'ubuntu-latest' - base-image: "ubuntu:22.04" + base-image: "ubuntu:24.04" backend: "diffusers" dockerfile: "./backend/Dockerfile.python" context: "./backend" @@ -91,7 +91,7 @@ jobs: tag-latest: 'true' tag-suffix: '-gpu-nvidia-cuda-11-kokoro' runs-on: 'ubuntu-latest' - base-image: "ubuntu:22.04" + base-image: "ubuntu:24.04" backend: "kokoro" dockerfile: "./backend/Dockerfile.python" context: "./backend" @@ -102,7 +102,7 @@ jobs: tag-latest: 'true' tag-suffix: '-gpu-nvidia-cuda-11-faster-whisper' runs-on: 'ubuntu-latest' - base-image: "ubuntu:22.04" + base-image: "ubuntu:24.04" backend: "faster-whisper" dockerfile: "./backend/Dockerfile.python" context: "./backend" @@ -113,7 +113,7 @@ jobs: tag-latest: 'true' tag-suffix: '-gpu-nvidia-cuda-11-coqui' runs-on: 'ubuntu-latest' - base-image: "ubuntu:22.04" + base-image: "ubuntu:24.04" backend: "coqui" dockerfile: "./backend/Dockerfile.python" context: "./backend" @@ -124,7 +124,7 @@ jobs: tag-latest: 'true' tag-suffix: '-gpu-nvidia-cuda-11-bark' runs-on: 'ubuntu-latest' - base-image: "ubuntu:22.04" + base-image: "ubuntu:24.04" backend: "bark" dockerfile: "./backend/Dockerfile.python" context: "./backend" @@ -135,7 +135,7 @@ jobs: tag-latest: 'true' tag-suffix: '-gpu-nvidia-cuda-11-chatterbox' runs-on: 'ubuntu-latest' - base-image: "ubuntu:22.04" + base-image: "ubuntu:24.04" backend: "chatterbox" dockerfile: "./backend/Dockerfile.python" context: "./backend" @@ -147,7 +147,7 @@ jobs: tag-latest: 'true' tag-suffix: '-gpu-nvidia-cuda-12-rerankers' runs-on: 'ubuntu-latest' - base-image: "ubuntu:22.04" + base-image: "ubuntu:24.04" backend: "rerankers" dockerfile: "./backend/Dockerfile.python" context: "./backend" @@ -158,7 +158,7 @@ jobs: tag-latest: 'true' tag-suffix: '-gpu-nvidia-cuda-12-vllm' runs-on: 'ubuntu-latest' - base-image: "ubuntu:22.04" + base-image: "ubuntu:24.04" backend: "vllm" dockerfile: "./backend/Dockerfile.python" context: "./backend" @@ -169,7 +169,7 @@ jobs: tag-latest: 'true' tag-suffix: '-gpu-nvidia-cuda-12-transformers' runs-on: 'ubuntu-latest' - base-image: "ubuntu:22.04" + base-image: "ubuntu:24.04" backend: "transformers" dockerfile: "./backend/Dockerfile.python" context: "./backend" @@ -180,7 +180,7 @@ jobs: tag-latest: 'true' tag-suffix: '-gpu-nvidia-cuda-12-diffusers' runs-on: 'ubuntu-latest' - base-image: "ubuntu:22.04" + base-image: "ubuntu:24.04" backend: "diffusers" dockerfile: "./backend/Dockerfile.python" context: "./backend" @@ -192,7 +192,7 @@ jobs: tag-latest: 'true' tag-suffix: '-gpu-nvidia-cuda-12-kokoro' runs-on: 'ubuntu-latest' - base-image: "ubuntu:22.04" + base-image: "ubuntu:24.04" backend: "kokoro" dockerfile: "./backend/Dockerfile.python" context: "./backend" @@ -203,7 +203,7 @@ jobs: tag-latest: 'true' tag-suffix: '-gpu-nvidia-cuda-12-faster-whisper' runs-on: 'ubuntu-latest' - base-image: "ubuntu:22.04" + base-image: "ubuntu:24.04" backend: "faster-whisper" dockerfile: "./backend/Dockerfile.python" context: "./backend" @@ -214,7 +214,7 @@ jobs: tag-latest: 'true' tag-suffix: '-gpu-nvidia-cuda-12-coqui' runs-on: 'ubuntu-latest' - base-image: "ubuntu:22.04" + base-image: "ubuntu:24.04" backend: "coqui" dockerfile: "./backend/Dockerfile.python" context: "./backend" @@ -225,7 +225,7 @@ jobs: tag-latest: 'true' tag-suffix: '-gpu-nvidia-cuda-12-bark' runs-on: 'ubuntu-latest' - base-image: "ubuntu:22.04" + base-image: "ubuntu:24.04" backend: "bark" dockerfile: "./backend/Dockerfile.python" context: "./backend" @@ -236,7 +236,7 @@ jobs: tag-latest: 'true' tag-suffix: '-gpu-nvidia-cuda-12-chatterbox' runs-on: 'ubuntu-latest' - base-image: "ubuntu:22.04" + base-image: "ubuntu:24.04" backend: "chatterbox" dockerfile: "./backend/Dockerfile.python" context: "./backend" @@ -248,7 +248,7 @@ jobs: tag-latest: 'true' tag-suffix: '-gpu-rocm-hipblas-rerankers' runs-on: 'ubuntu-latest' - base-image: "rocm/dev-ubuntu-22.04:6.1" + base-image: "rocm/dev-ubuntu-24.04:6.4.1" backend: "rerankers" dockerfile: "./backend/Dockerfile.python" context: "./backend" @@ -259,7 +259,7 @@ jobs: tag-latest: 'true' tag-suffix: '-gpu-rocm-hipblas-vllm' runs-on: 'ubuntu-latest' - base-image: "rocm/dev-ubuntu-22.04:6.1" + base-image: "rocm/dev-ubuntu-24.04:6.4.1" backend: "vllm" dockerfile: "./backend/Dockerfile.python" context: "./backend" @@ -270,7 +270,7 @@ jobs: tag-latest: 'true' tag-suffix: '-gpu-rocm-hipblas-transformers' runs-on: 'ubuntu-latest' - base-image: "rocm/dev-ubuntu-22.04:6.1" + base-image: "rocm/dev-ubuntu-24.04:6.4.1" backend: "transformers" dockerfile: "./backend/Dockerfile.python" context: "./backend" @@ -281,7 +281,7 @@ jobs: tag-latest: 'true' tag-suffix: '-gpu-rocm-hipblas-diffusers' runs-on: 'ubuntu-latest' - base-image: "rocm/dev-ubuntu-22.04:6.1" + base-image: "rocm/dev-ubuntu-24.04:6.4.1" backend: "diffusers" dockerfile: "./backend/Dockerfile.python" context: "./backend" @@ -293,7 +293,7 @@ jobs: tag-latest: 'true' tag-suffix: '-gpu-rocm-hipblas-kokoro' runs-on: 'ubuntu-latest' - base-image: "rocm/dev-ubuntu-22.04:6.1" + base-image: "rocm/dev-ubuntu-24.04:6.4.1" backend: "kokoro" dockerfile: "./backend/Dockerfile.python" context: "./backend" @@ -304,7 +304,7 @@ jobs: tag-latest: 'true' tag-suffix: '-gpu-rocm-hipblas-faster-whisper' runs-on: 'ubuntu-latest' - base-image: "rocm/dev-ubuntu-22.04:6.1" + base-image: "rocm/dev-ubuntu-24.04:6.4.1" backend: "faster-whisper" dockerfile: "./backend/Dockerfile.python" context: "./backend" @@ -315,7 +315,7 @@ jobs: tag-latest: 'true' tag-suffix: '-gpu-rocm-hipblas-coqui' runs-on: 'ubuntu-latest' - base-image: "rocm/dev-ubuntu-22.04:6.1" + base-image: "rocm/dev-ubuntu-24.04:6.4.1" backend: "coqui" dockerfile: "./backend/Dockerfile.python" context: "./backend" @@ -326,7 +326,7 @@ jobs: tag-latest: 'true' tag-suffix: '-gpu-rocm-hipblas-bark' runs-on: 'ubuntu-latest' - base-image: "rocm/dev-ubuntu-22.04:6.1" + base-image: "rocm/dev-ubuntu-24.04:6.4.1" backend: "bark" dockerfile: "./backend/Dockerfile.python" context: "./backend" @@ -505,7 +505,7 @@ jobs: tag-latest: 'true' tag-suffix: '-bark-cpp' runs-on: 'ubuntu-latest' - base-image: "ubuntu:22.04" + base-image: "ubuntu:24.04" backend: "bark" dockerfile: "./backend/Dockerfile.go" context: "./" \ No newline at end of file diff --git a/.github/workflows/generate_grpc_cache.yaml b/.github/workflows/generate_grpc_cache.yaml index a980c3491b58..04d69c3d2c43 100644 --- a/.github/workflows/generate_grpc_cache.yaml +++ b/.github/workflows/generate_grpc_cache.yaml @@ -16,7 +16,7 @@ jobs: strategy: matrix: include: - - grpc-base-image: ubuntu:22.04 + - grpc-base-image: ubuntu:24.04 runs-on: 'ubuntu-latest' platforms: 'linux/amd64,linux/arm64' runs-on: ${{matrix.runs-on}} diff --git a/.github/workflows/generate_intel_image.yaml b/.github/workflows/generate_intel_image.yaml index 20ce1d5a7296..437c1344c029 100644 --- a/.github/workflows/generate_intel_image.yaml +++ b/.github/workflows/generate_intel_image.yaml @@ -15,7 +15,7 @@ jobs: strategy: matrix: include: - - base-image: intel/oneapi-basekit:2025.1.0-0-devel-ubuntu22.04 + - base-image: intel/oneapi-basekit:2025.1.3-0-devel-ubuntu24.04 runs-on: 'ubuntu-latest' platforms: 'linux/amd64' runs-on: ${{matrix.runs-on}} diff --git a/.github/workflows/image-pr.yml b/.github/workflows/image-pr.yml index 0a3ed2708a6f..ea10e4960e10 100644 --- a/.github/workflows/image-pr.yml +++ b/.github/workflows/image-pr.yml @@ -43,22 +43,22 @@ jobs: tag-suffix: '-gpu-nvidia-cuda12-ffmpeg' ffmpeg: 'true' runs-on: 'ubuntu-latest' - base-image: "ubuntu:22.04" + base-image: "ubuntu:24.04" makeflags: "--jobs=3 --output-sync=target" - build-type: 'hipblas' platforms: 'linux/amd64' tag-latest: 'false' tag-suffix: '-hipblas' ffmpeg: 'false' - base-image: "rocm/dev-ubuntu-22.04:6.1" - grpc-base-image: "ubuntu:22.04" + base-image: "rocm/dev-ubuntu-24.04:6.4.1" + grpc-base-image: "ubuntu:24.04" runs-on: 'ubuntu-latest' makeflags: "--jobs=3 --output-sync=target" - build-type: 'sycl_f16' platforms: 'linux/amd64' tag-latest: 'false' base-image: "quay.io/go-skynet/intel-oneapi-base:latest" - grpc-base-image: "ubuntu:22.04" + grpc-base-image: "ubuntu:24.04" tag-suffix: 'sycl-f16-ffmpeg' ffmpeg: 'true' runs-on: 'ubuntu-latest' @@ -69,5 +69,5 @@ jobs: tag-suffix: '-vulkan-ffmpeg-core' ffmpeg: 'true' runs-on: 'ubuntu-latest' - base-image: "ubuntu:22.04" + base-image: "ubuntu:24.04" makeflags: "--jobs=4 --output-sync=target" diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml index 7339038c3583..c7a1d052cd73 100644 --- a/.github/workflows/image.yml +++ b/.github/workflows/image.yml @@ -41,8 +41,8 @@ jobs: tag-latest: 'auto' tag-suffix: '-gpu-hipblas' ffmpeg: 'true' - base-image: "rocm/dev-ubuntu-22.04:6.1" - grpc-base-image: "ubuntu:22.04" + base-image: "rocm/dev-ubuntu-24.04:6.4.1" + grpc-base-image: "ubuntu:24.04" runs-on: 'ubuntu-latest' makeflags: "--jobs=3 --output-sync=target" aio: "-aio-gpu-hipblas" @@ -77,7 +77,7 @@ jobs: tag-latest: 'auto' tag-suffix: '' ffmpeg: 'true' - base-image: "ubuntu:22.04" + base-image: "ubuntu:24.04" runs-on: 'ubuntu-latest' aio: "-aio-cpu" makeflags: "--jobs=4 --output-sync=target" @@ -90,7 +90,7 @@ jobs: tag-suffix: '-gpu-nvidia-cuda11' ffmpeg: 'true' runs-on: 'ubuntu-latest' - base-image: "ubuntu:22.04" + base-image: "ubuntu:24.04" makeflags: "--jobs=4 --output-sync=target" skip-drivers: 'false' aio: "-aio-gpu-nvidia-cuda-11" @@ -102,7 +102,7 @@ jobs: tag-suffix: '-gpu-nvidia-cuda12' ffmpeg: 'true' runs-on: 'ubuntu-latest' - base-image: "ubuntu:22.04" + base-image: "ubuntu:24.04" skip-drivers: 'false' makeflags: "--jobs=4 --output-sync=target" aio: "-aio-gpu-nvidia-cuda-12" @@ -112,7 +112,7 @@ jobs: tag-suffix: '-vulkan' ffmpeg: 'true' runs-on: 'ubuntu-latest' - base-image: "ubuntu:22.04" + base-image: "ubuntu:24.04" skip-drivers: 'false' makeflags: "--jobs=4 --output-sync=target" aio: "-aio-gpu-vulkan" @@ -120,7 +120,7 @@ jobs: platforms: 'linux/amd64' tag-latest: 'auto' base-image: "quay.io/go-skynet/intel-oneapi-base:latest" - grpc-base-image: "ubuntu:22.04" + grpc-base-image: "ubuntu:24.04" tag-suffix: '-gpu-intel-f16' ffmpeg: 'true' runs-on: 'ubuntu-latest' @@ -130,7 +130,7 @@ jobs: platforms: 'linux/amd64' tag-latest: 'auto' base-image: "quay.io/go-skynet/intel-oneapi-base:latest" - grpc-base-image: "ubuntu:22.04" + grpc-base-image: "ubuntu:24.04" tag-suffix: '-gpu-intel-f32' ffmpeg: 'true' runs-on: 'ubuntu-latest' diff --git a/Dockerfile b/Dockerfile index 1a3f92e5210f..7ce02eb158a0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=ubuntu:22.04 +ARG BASE_IMAGE=ubuntu:24.04 ARG GRPC_BASE_IMAGE=${BASE_IMAGE} ARG INTEL_BASE_IMAGE=${BASE_IMAGE} diff --git a/Dockerfile.aio b/Dockerfile.aio index 81063bb4dbeb..ccc2fc94b9ed 100644 --- a/Dockerfile.aio +++ b/Dockerfile.aio @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=ubuntu:22.04 +ARG BASE_IMAGE=ubuntu:24.04 FROM ${BASE_IMAGE} diff --git a/Makefile b/Makefile index e8a96da24130..154fa950cd6c 100644 --- a/Makefile +++ b/Makefile @@ -817,7 +817,7 @@ grpcs: prepare $(GRPC_BACKENDS) DOCKER_IMAGE?=local-ai DOCKER_AIO_IMAGE?=local-ai-aio IMAGE_TYPE?=core -BASE_IMAGE?=ubuntu:22.04 +BASE_IMAGE?=ubuntu:24.04 docker: docker build \ @@ -852,7 +852,7 @@ docker-aio-all: docker-image-intel: docker build \ - --build-arg BASE_IMAGE=intel/oneapi-basekit:2025.1.0-0-devel-ubuntu24.04 \ + --build-arg BASE_IMAGE=intel/oneapi-basekit:2025.1.3-0-devel-ubuntu24.04 \ --build-arg IMAGE_TYPE=$(IMAGE_TYPE) \ --build-arg GO_TAGS="$(GO_TAGS)" \ --build-arg MAKEFLAGS="$(DOCKER_MAKEFLAGS)" \ @@ -860,7 +860,7 @@ docker-image-intel: docker-image-intel-xpu: docker build \ - --build-arg BASE_IMAGE=intel/oneapi-basekit:2025.1.0-0-devel-ubuntu22.04 \ + --build-arg BASE_IMAGE=intel/oneapi-basekit:2025.1.3-0-devel-ubuntu24.04 \ --build-arg IMAGE_TYPE=$(IMAGE_TYPE) \ --build-arg GO_TAGS="$(GO_TAGS)" \ --build-arg MAKEFLAGS="$(DOCKER_MAKEFLAGS)" \ diff --git a/backend/Dockerfile.go b/backend/Dockerfile.go index 504e9dafb58f..21452844be30 100644 --- a/backend/Dockerfile.go +++ b/backend/Dockerfile.go @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=ubuntu:22.04 +ARG BASE_IMAGE=ubuntu:24.04 FROM ${BASE_IMAGE} AS builder ARG BACKEND=rerankers diff --git a/backend/Dockerfile.python b/backend/Dockerfile.python index 04e8e0201965..b2a8af00ce1b 100644 --- a/backend/Dockerfile.python +++ b/backend/Dockerfile.python @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=ubuntu:22.04 +ARG BASE_IMAGE=ubuntu:24.04 FROM ${BASE_IMAGE} AS builder ARG BACKEND=rerankers diff --git a/docker-compose.yaml b/docker-compose.yaml index 2306c28f3efb..006bd9bf07d2 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -11,7 +11,7 @@ services: dockerfile: Dockerfile args: - IMAGE_TYPE=core - - BASE_IMAGE=ubuntu:22.04 + - BASE_IMAGE=ubuntu:24.04 ports: - 8080:8080 env_file: From 057d5c25f1ed4bfb67b2f227e1e00fa2edf527df Mon Sep 17 00:00:00 2001 From: Ettore Di Giacinto Date: Fri, 4 Jul 2025 18:49:15 +0200 Subject: [PATCH 2/2] test CI (remove me) Signed-off-by: Ettore Di Giacinto --- .github/workflows/backend.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index 36b6bf2843f4..ec2a814562d0 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -7,7 +7,7 @@ on: - master tags: - '*' - #pull_request: + pull_request: concurrency: group: ci-backends-${{ github.head_ref || github.ref }}-${{ github.repository }}