Skip to content

Commit 7a15ff1

Browse files
mudlermudler
committed
chore(deps): update base images to ubuntu 24.04
Signed-off-by: Ettore Di Giacinto <mudler@localai.io>
1 parent f0c41d6 commit 7a15ff1

File tree

7 files changed

+34
-34
lines changed

7 files changed

+34
-34
lines changed

‎.github/workflows/generate_grpc_cache.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
matrix:
1818
include:
19-
- grpc-base-image: ubuntu:22.04
19+
- grpc-base-image: ubuntu:24.04
2020
runs-on: 'arc-runner-set'
2121
platforms: 'linux/amd64,linux/arm64'
2222
runs-on: ${{matrix.runs-on}}

‎.github/workflows/generate_intel_image.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
matrix:
1717
include:
18-
- base-image: intel/oneapi-basekit:2025.1.0-0-devel-ubuntu22.04
18+
- base-image: intel/oneapi-basekit:2025.1.3-0-devel-ubuntu24.04
1919
runs-on: 'ubuntu-latest'
2020
platforms: 'linux/amd64'
2121
runs-on: ${{matrix.runs-on}}

‎.github/workflows/image-pr.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
# ffmpeg: 'true'
4545
# image-type: 'extras'
4646
# runs-on: 'arc-runner-set'
47-
# base-image: "ubuntu:22.04"
47+
# base-image: "ubuntu:24.04"
4848
# makeflags: "--jobs=3 --output-sync=target"
4949
- build-type: 'cublas'
5050
cuda-major-version: "12"
@@ -55,23 +55,23 @@ jobs:
5555
ffmpeg: 'true'
5656
image-type: 'extras'
5757
runs-on: 'arc-runner-set'
58-
base-image: "ubuntu:22.04"
58+
base-image: "ubuntu:24.04"
5959
makeflags: "--jobs=3 --output-sync=target"
6060
- build-type: 'hipblas'
6161
platforms: 'linux/amd64'
6262
tag-latest: 'false'
6363
tag-suffix: '-hipblas'
6464
ffmpeg: 'false'
6565
image-type: 'extras'
66-
base-image: "rocm/dev-ubuntu-22.04:6.1"
67-
grpc-base-image: "ubuntu:22.04"
66+
base-image: "rocm/dev-ubuntu-24.04:6.4.1"
67+
grpc-base-image: "ubuntu:24.04"
6868
runs-on: 'arc-runner-set'
6969
makeflags: "--jobs=3 --output-sync=target"
7070
- build-type: 'sycl_f16'
7171
platforms: 'linux/amd64'
7272
tag-latest: 'false'
7373
base-image: "quay.io/go-skynet/intel-oneapi-base:latest"
74-
grpc-base-image: "ubuntu:22.04"
74+
grpc-base-image: "ubuntu:24.04"
7575
tag-suffix: 'sycl-f16-ffmpeg'
7676
ffmpeg: 'true'
7777
image-type: 'extras'
@@ -84,7 +84,7 @@ jobs:
8484
ffmpeg: 'true'
8585
image-type: 'core'
8686
runs-on: 'ubuntu-latest'
87-
base-image: "ubuntu:22.04"
87+
base-image: "ubuntu:24.04"
8888
makeflags: "--jobs=4 --output-sync=target"
8989
# core-image-build:
9090
# uses: ./.github/workflows/image_build.yml
@@ -116,13 +116,13 @@ jobs:
116116
# ffmpeg: 'true'
117117
# image-type: 'core'
118118
# runs-on: 'ubuntu-latest'
119-
# base-image: "ubuntu:22.04"
119+
# base-image: "ubuntu:24.04"
120120
# makeflags: "--jobs=4 --output-sync=target"
121121
# - build-type: 'sycl_f16'
122122
# platforms: 'linux/amd64'
123123
# tag-latest: 'false'
124124
# base-image: "quay.io/go-skynet/intel-oneapi-base:latest"
125-
# grpc-base-image: "ubuntu:22.04"
125+
# grpc-base-image: "ubuntu:24.04"
126126
# tag-suffix: 'sycl-f16-ffmpeg-core'
127127
# ffmpeg: 'true'
128128
# image-type: 'core'
@@ -137,7 +137,7 @@ jobs:
137137
# ffmpeg: 'true'
138138
# image-type: 'core'
139139
# runs-on: 'ubuntu-latest'
140-
# base-image: "ubuntu:22.04"
140+
# base-image: "ubuntu:24.04"
141141
# makeflags: "--jobs=4 --output-sync=target"
142142
# - build-type: 'vulkan'
143143
# platforms: 'linux/amd64'
@@ -146,5 +146,5 @@ jobs:
146146
# ffmpeg: 'true'
147147
# image-type: 'core'
148148
# runs-on: 'ubuntu-latest'
149-
# base-image: "ubuntu:22.04"
149+
# base-image: "ubuntu:24.04"
150150
# makeflags: "--jobs=4 --output-sync=target"

‎.github/workflows/image.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ jobs:
4949
ffmpeg: 'true'
5050
image-type: 'extras'
5151
aio: "-aio-gpu-hipblas"
52-
base-image: "rocm/dev-ubuntu-22.04:6.1"
53-
grpc-base-image: "ubuntu:22.04"
52+
base-image: "rocm/dev-ubuntu-24.04:6.4.1"
53+
grpc-base-image: "ubuntu:24.04"
5454
latest-image: 'latest-gpu-hipblas-extras'
5555
latest-image-aio: 'latest-aio-gpu-hipblas'
5656
runs-on: 'arc-runner-set'
@@ -61,8 +61,8 @@ jobs:
6161
tag-suffix: '-hipblas'
6262
ffmpeg: 'true'
6363
image-type: 'core'
64-
base-image: "rocm/dev-ubuntu-22.04:6.1"
65-
grpc-base-image: "ubuntu:22.04"
64+
base-image: "rocm/dev-ubuntu-24.04:6.4.1"
65+
grpc-base-image: "ubuntu:24.04"
6666
runs-on: 'arc-runner-set'
6767
makeflags: "--jobs=3 --output-sync=target"
6868
latest-image: 'latest-gpu-hipblas'
@@ -104,7 +104,7 @@ jobs:
104104
ffmpeg: 'true'
105105
image-type: 'extras'
106106
runs-on: 'arc-runner-set'
107-
base-image: "ubuntu:22.04"
107+
base-image: "ubuntu:24.04"
108108
aio: "-aio-gpu-nvidia-cuda-11"
109109
latest-image: 'latest-gpu-nvidia-cuda-11-extras'
110110
latest-image-aio: 'latest-aio-gpu-nvidia-cuda-11'
@@ -118,7 +118,7 @@ jobs:
118118
ffmpeg: 'true'
119119
image-type: 'extras'
120120
runs-on: 'arc-runner-set'
121-
base-image: "ubuntu:22.04"
121+
base-image: "ubuntu:24.04"
122122
aio: "-aio-gpu-nvidia-cuda-12"
123123
latest-image: 'latest-gpu-nvidia-cuda-12-extras'
124124
latest-image-aio: 'latest-aio-gpu-nvidia-cuda-12'
@@ -127,7 +127,7 @@ jobs:
127127
platforms: 'linux/amd64'
128128
tag-latest: 'false'
129129
base-image: "quay.io/go-skynet/intel-oneapi-base:latest"
130-
grpc-base-image: "ubuntu:22.04"
130+
grpc-base-image: "ubuntu:24.04"
131131
tag-suffix: '-sycl-f16-extras'
132132
ffmpeg: 'true'
133133
image-type: 'extras'
@@ -140,7 +140,7 @@ jobs:
140140
platforms: 'linux/amd64'
141141
tag-latest: 'false'
142142
base-image: "quay.io/go-skynet/intel-oneapi-base:latest"
143-
grpc-base-image: "ubuntu:22.04"
143+
grpc-base-image: "ubuntu:24.04"
144144
tag-suffix: '-sycl-f32-extras'
145145
ffmpeg: 'true'
146146
image-type: 'extras'
@@ -154,7 +154,7 @@ jobs:
154154
platforms: 'linux/amd64'
155155
tag-latest: 'false'
156156
base-image: "quay.io/go-skynet/intel-oneapi-base:latest"
157-
grpc-base-image: "ubuntu:22.04"
157+
grpc-base-image: "ubuntu:24.04"
158158
tag-suffix: '-sycl-f16'
159159
ffmpeg: 'true'
160160
image-type: 'core'
@@ -165,7 +165,7 @@ jobs:
165165
platforms: 'linux/amd64'
166166
tag-latest: 'false'
167167
base-image: "quay.io/go-skynet/intel-oneapi-base:latest"
168-
grpc-base-image: "ubuntu:22.04"
168+
grpc-base-image: "ubuntu:24.04"
169169
tag-suffix: '-sycl-f32'
170170
ffmpeg: 'true'
171171
image-type: 'core'
@@ -207,7 +207,7 @@ jobs:
207207
tag-suffix: ''
208208
ffmpeg: 'true'
209209
image-type: 'core'
210-
base-image: "ubuntu:22.04"
210+
base-image: "ubuntu:24.04"
211211
runs-on: 'arc-runner-set'
212212
aio: "-aio-cpu"
213213
latest-image: 'latest-cpu'
@@ -223,7 +223,7 @@ jobs:
223223
ffmpeg: 'true'
224224
image-type: 'core'
225225
runs-on: 'arc-runner-set'
226-
base-image: "ubuntu:22.04"
226+
base-image: "ubuntu:24.04"
227227
makeflags: "--jobs=4 --output-sync=target"
228228
skip-drivers: 'false'
229229
latest-image: 'latest-gpu-nvidia-cuda-12'
@@ -236,7 +236,7 @@ jobs:
236236
ffmpeg: 'true'
237237
image-type: 'core'
238238
runs-on: 'arc-runner-set'
239-
base-image: "ubuntu:22.04"
239+
base-image: "ubuntu:24.04"
240240
skip-drivers: 'false'
241241
makeflags: "--jobs=4 --output-sync=target"
242242
latest-image: 'latest-gpu-nvidia-cuda-12'
@@ -247,7 +247,7 @@ jobs:
247247
ffmpeg: 'true'
248248
image-type: 'core'
249249
runs-on: 'arc-runner-set'
250-
base-image: "ubuntu:22.04"
250+
base-image: "ubuntu:24.04"
251251
skip-drivers: 'false'
252252
makeflags: "--jobs=4 --output-sync=target"
253253
latest-image: 'latest-gpu-vulkan'

‎Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG IMAGE_TYPE=extras
2-
ARG BASE_IMAGE=ubuntu:22.04
2+
ARG BASE_IMAGE=ubuntu:24.04
33
ARG GRPC_BASE_IMAGE=${BASE_IMAGE}
44
ARG INTEL_BASE_IMAGE=${BASE_IMAGE}
55

@@ -29,7 +29,7 @@ RUN apt-get update && \
2929
apt-get clean && \
3030
rm -rf /var/lib/apt/lists/*
3131

32-
# Install CMake (the version in 22.04 is too old)
32+
# Install CMake (the version in 24.04 is too old)
3333
RUN <<EOT bash
3434
if [ "${CMAKE_FROM_SOURCE}}" = "true" ]; then
3535
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 && \
216216
apt-get clean && \
217217
rm -rf /var/lib/apt/lists/*
218218

219-
# Install CMake (the version in 22.04 is too old)
219+
# Install CMake (the version in 24.04 is too old)
220220
RUN <<EOT bash
221221
if [ "${CMAKE_FROM_SOURCE}}" = "true" ]; then
222222
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"
266266
WORKDIR /build
267267

268268

269-
# We need protoc installed, and the version in 22.04 is too old. We will create one as part installing the GRPC build below
269+
# We need protoc installed, and the version in 24.04 is too old. We will create one as part installing the GRPC build below
270270
# but that will also being in a newer version of absl which stablediffusion cannot compile with. This version of protoc is only
271271
# here so that we can generate the grpc code for the stablediffusion build
272272
RUN <<EOT bash

‎Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -818,7 +818,7 @@ grpcs: prepare $(GRPC_BACKENDS)
818818
DOCKER_IMAGE?=local-ai
819819
DOCKER_AIO_IMAGE?=local-ai-aio
820820
IMAGE_TYPE?=core
821-
BASE_IMAGE?=ubuntu:22.04
821+
BASE_IMAGE?=ubuntu:24.04
822822

823823
docker:
824824
docker build \
@@ -853,15 +853,15 @@ docker-aio-all:
853853

854854
docker-image-intel:
855855
docker build \
856-
--build-arg BASE_IMAGE=intel/oneapi-basekit:2025.1.0-0-devel-ubuntu24.04 \
856+
--build-arg BASE_IMAGE=intel/oneapi-basekit:2025.1.3-0-devel-ubuntu24.04 \
857857
--build-arg IMAGE_TYPE=$(IMAGE_TYPE) \
858858
--build-arg GO_TAGS="$(GO_TAGS)" \
859859
--build-arg MAKEFLAGS="$(DOCKER_MAKEFLAGS)" \
860860
--build-arg BUILD_TYPE=sycl_f32 -t $(DOCKER_IMAGE) .
861861

862862
docker-image-intel-xpu:
863863
docker build \
864-
--build-arg BASE_IMAGE=intel/oneapi-basekit:2025.1.0-0-devel-ubuntu22.04 \
864+
--build-arg BASE_IMAGE=intel/oneapi-basekit:2025.1.3-0-devel-ubuntu24.04 \
865865
--build-arg IMAGE_TYPE=$(IMAGE_TYPE) \
866866
--build-arg GO_TAGS="$(GO_TAGS)" \
867867
--build-arg MAKEFLAGS="$(DOCKER_MAKEFLAGS)" \

‎docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ services:
1111
dockerfile: Dockerfile
1212
args:
1313
- IMAGE_TYPE=core
14-
- BASE_IMAGE=ubuntu:22.04
14+
- BASE_IMAGE=ubuntu:24.04
1515
ports:
1616
- 8080:8080
1717
env_file:

0 commit comments

Comments
 (0)