From 7a15ff166ee55ba6bc4ec2077c0c43d44dc6d42b Mon Sep 17 00:00:00 2001
From: Ettore Di Giacinto <mudler@localai.io>
Date: Sat, 31 May 2025 09:35:26 +0200
Subject: [PATCH 1/3] chore(deps): update base images to ubuntu 24.04

Signed-off-by: Ettore Di Giacinto <mudler@localai.io>
---
 .github/workflows/generate_grpc_cache.yaml  |  2 +-
 .github/workflows/generate_intel_image.yaml |  2 +-
 .github/workflows/image-pr.yml              | 20 +++++++--------
 .github/workflows/image.yml                 | 28 ++++++++++-----------
 Dockerfile                                  |  8 +++---
 Makefile                                    |  6 ++---
 docker-compose.yaml                         |  2 +-
 7 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/generate_grpc_cache.yaml b/.github/workflows/generate_grpc_cache.yaml
index 44497d3d..a81038ab 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: 'arc-runner-set'
             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 20ce1d5a..437c1344 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 2d8ce440..2323695a 100644
--- a/.github/workflows/image-pr.yml
+++ b/.github/workflows/image-pr.yml
@@ -44,7 +44,7 @@ jobs:
           #   ffmpeg: 'true'
           #   image-type: 'extras'
           #   runs-on: 'arc-runner-set'
-          #   base-image: "ubuntu:22.04"
+          #   base-image: "ubuntu:24.04"
           #   makeflags: "--jobs=3 --output-sync=target"
           - build-type: 'cublas'
             cuda-major-version: "12"
@@ -55,7 +55,7 @@ jobs:
             ffmpeg: 'true'
             image-type: 'extras'
             runs-on: 'arc-runner-set'
-            base-image: "ubuntu:22.04"
+            base-image: "ubuntu:24.04"
             makeflags: "--jobs=3 --output-sync=target"
           - build-type: 'hipblas'
             platforms: 'linux/amd64'
@@ -63,15 +63,15 @@ jobs:
             tag-suffix: '-hipblas'
             ffmpeg: 'false'
             image-type: 'extras'
-            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: 'arc-runner-set'
             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'
             image-type: 'extras'
@@ -84,7 +84,7 @@ jobs:
             ffmpeg: 'true'
             image-type: 'core'
             runs-on: 'ubuntu-latest'
-            base-image: "ubuntu:22.04"
+            base-image: "ubuntu:24.04"
             makeflags: "--jobs=4 --output-sync=target"
   # core-image-build:
   #   uses: ./.github/workflows/image_build.yml
@@ -116,13 +116,13 @@ jobs:
           #   ffmpeg: 'true'
           #   image-type: 'core'
           #   runs-on: 'ubuntu-latest'
-          #   base-image: "ubuntu:22.04"
+          #   base-image: "ubuntu:24.04"
           #   makeflags: "--jobs=4 --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-core'
           #   ffmpeg: 'true'
           #   image-type: 'core'
@@ -137,7 +137,7 @@ jobs:
           #   ffmpeg: 'true'
           #   image-type: 'core'
           #   runs-on: 'ubuntu-latest'
-          #   base-image: "ubuntu:22.04"
+          #   base-image: "ubuntu:24.04"
           #   makeflags: "--jobs=4 --output-sync=target"
           # - build-type: 'vulkan'
           #   platforms: 'linux/amd64'
@@ -146,5 +146,5 @@ jobs:
           #   ffmpeg: 'true'
           #   image-type: 'core'
           #   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 01709010..1d38f4dc 100644
--- a/.github/workflows/image.yml
+++ b/.github/workflows/image.yml
@@ -49,8 +49,8 @@ jobs:
             ffmpeg: 'true'
             image-type: 'extras'
             aio: "-aio-gpu-hipblas"
-            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"
             latest-image: 'latest-gpu-hipblas-extras'
             latest-image-aio: 'latest-aio-gpu-hipblas'
             runs-on: 'arc-runner-set'
@@ -61,8 +61,8 @@ jobs:
             tag-suffix: '-hipblas'
             ffmpeg: 'true'
             image-type: 'core'
-            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: 'arc-runner-set'
             makeflags: "--jobs=3 --output-sync=target"
             latest-image: 'latest-gpu-hipblas'
@@ -104,7 +104,7 @@ jobs:
             ffmpeg: 'true'
             image-type: 'extras'
             runs-on: 'arc-runner-set'
-            base-image: "ubuntu:22.04"
+            base-image: "ubuntu:24.04"
             aio: "-aio-gpu-nvidia-cuda-11"
             latest-image: 'latest-gpu-nvidia-cuda-11-extras'
             latest-image-aio: 'latest-aio-gpu-nvidia-cuda-11'
@@ -118,7 +118,7 @@ jobs:
             ffmpeg: 'true'
             image-type: 'extras'
             runs-on: 'arc-runner-set'
-            base-image: "ubuntu:22.04"
+            base-image: "ubuntu:24.04"
             aio: "-aio-gpu-nvidia-cuda-12"
             latest-image: 'latest-gpu-nvidia-cuda-12-extras'
             latest-image-aio: 'latest-aio-gpu-nvidia-cuda-12'
@@ -127,7 +127,7 @@ jobs:
             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-extras'
             ffmpeg: 'true'
             image-type: 'extras'
@@ -140,7 +140,7 @@ jobs:
             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-f32-extras'
             ffmpeg: 'true'
             image-type: 'extras'
@@ -154,7 +154,7 @@ jobs:
             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: 'true'
             image-type: 'core'
@@ -165,7 +165,7 @@ jobs:
             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-f32'
             ffmpeg: 'true'
             image-type: 'core'
@@ -207,7 +207,7 @@ jobs:
             tag-suffix: ''
             ffmpeg: 'true'
             image-type: 'core'
-            base-image: "ubuntu:22.04"
+            base-image: "ubuntu:24.04"
             runs-on: 'arc-runner-set'
             aio: "-aio-cpu"
             latest-image: 'latest-cpu'
@@ -223,7 +223,7 @@ jobs:
             ffmpeg: 'true'
             image-type: 'core'
             runs-on: 'arc-runner-set'
-            base-image: "ubuntu:22.04"
+            base-image: "ubuntu:24.04"
             makeflags: "--jobs=4 --output-sync=target"
             skip-drivers: 'false'
             latest-image: 'latest-gpu-nvidia-cuda-12'
@@ -236,7 +236,7 @@ jobs:
             ffmpeg: 'true'
             image-type: 'core'
             runs-on: 'arc-runner-set'
-            base-image: "ubuntu:22.04"
+            base-image: "ubuntu:24.04"
             skip-drivers: 'false'
             makeflags: "--jobs=4 --output-sync=target"
             latest-image: 'latest-gpu-nvidia-cuda-12'
@@ -247,7 +247,7 @@ jobs:
             ffmpeg: 'true'
             image-type: 'core'
             runs-on: 'arc-runner-set'
-            base-image: "ubuntu:22.04"
+            base-image: "ubuntu:24.04"
             skip-drivers: 'false'
             makeflags: "--jobs=4 --output-sync=target"
             latest-image: 'latest-gpu-vulkan'
diff --git a/Dockerfile b/Dockerfile
index 5dadfe4c..3a3ac186 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 ARG IMAGE_TYPE=extras
-ARG BASE_IMAGE=ubuntu:22.04
+ARG BASE_IMAGE=ubuntu:24.04
 ARG GRPC_BASE_IMAGE=${BASE_IMAGE}
 ARG INTEL_BASE_IMAGE=${BASE_IMAGE}
 
@@ -29,7 +29,7 @@ RUN apt-get update && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
-# Install CMake (the version in 22.04 is too old)
+# Install CMake (the version in 24.04 is too old)
 RUN <<EOT bash
     if [ "${CMAKE_FROM_SOURCE}}" = "true" ]; then
         curl -L -s https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}.tar.gz -o cmake.tar.gz && tar xvf cmake.tar.gz && cd cmake-${CMAKE_VERSION} && ./configure && make && make install
@@ -216,7 +216,7 @@ RUN apt-get update && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
-# Install CMake (the version in 22.04 is too old)
+# Install CMake (the version in 24.04 is too old)
 RUN <<EOT bash
     if [ "${CMAKE_FROM_SOURCE}}" = "true" ]; then
         curl -L -s https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}.tar.gz -o cmake.tar.gz && tar xvf cmake.tar.gz && cd cmake-${CMAKE_VERSION} && ./configure && make && make install
@@ -266,7 +266,7 @@ RUN echo "GO_TAGS: $GO_TAGS" && echo "TARGETARCH: $TARGETARCH"
 WORKDIR /build
 
 
-# We need protoc installed, and the version in 22.04 is too old.  We will create one as part installing the GRPC build below
+# We need protoc installed, and the version in 24.04 is too old.  We will create one as part installing the GRPC build below
 # but that will also being in a newer version of absl which stablediffusion cannot compile with.  This version of protoc is only
 # here so that we can generate the grpc code for the stablediffusion build
 RUN <<EOT bash
diff --git a/Makefile b/Makefile
index 3ed117a3..1b9f5471 100644
--- a/Makefile
+++ b/Makefile
@@ -818,7 +818,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 \
@@ -853,7 +853,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)" \
@@ -861,7 +861,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/docker-compose.yaml b/docker-compose.yaml
index 2306c28f..006bd9bf 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 bcd770194be28d87a56a6caad5489c5b194cc491 Mon Sep 17 00:00:00 2001
From: Ettore Di Giacinto <mudler@localai.io>
Date: Sat, 31 May 2025 09:42:12 +0200
Subject: [PATCH 2/3] fix: do not use pip system-wide anymore

Signed-off-by: Ettore Di Giacinto <mudler@localai.io>
---
 Dockerfile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3a3ac186..7d2f5428 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -95,12 +95,14 @@ RUN apt-get update && \
         python-is-python3 \
         python3-dev llvm \
         python3-venv && \
+        python3-grpcio-tools && \
     apt-get clean && \
-    rm -rf /var/lib/apt/lists/* && \
-    pip install --upgrade pip
+    rm -rf /var/lib/apt/lists/* 
+    # && \
+   # pip install --upgrade pip --break-system-packages
 
-# Install grpcio-tools (the version in 22.04 is too old)
-RUN pip install --user grpcio-tools
+# Install grpcio-tools (the version in 24.04 is too old)
+#RUN pip install --user grpcio-tools --break-system-packages
 
 ###################################
 ###################################

From 31f6ab994f18bc92f973cb2ccc058a107a25dc65 Mon Sep 17 00:00:00 2001
From: Ettore Di Giacinto <mudler@localai.io>
Date: Sat, 31 May 2025 10:24:12 +0200
Subject: [PATCH 3/3] fix: install grpcio-tools with pip

Signed-off-by: Ettore Di Giacinto <mudler@localai.io>
---
 Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7d2f5428..762c3858 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -95,14 +95,13 @@ RUN apt-get update && \
         python-is-python3 \
         python3-dev llvm \
         python3-venv && \
-        python3-grpcio-tools && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* 
     # && \
    # pip install --upgrade pip --break-system-packages
 
 # Install grpcio-tools (the version in 24.04 is too old)
-#RUN pip install --user grpcio-tools --break-system-packages
+RUN pip install --user grpcio-tools --break-system-packages
 
 ###################################
 ###################################