From 78761e911c8b482f28712ddeb685fc5791ee2ccc Mon Sep 17 00:00:00 2001 From: Michal Babej <michal.babej@intel.com> Date: Mon, 7 Oct 2024 16:29:06 +0300 Subject: [PATCH] tools/docker: update Ubuntu images --- tools/docker/Ubuntu/22_04.dockerfile | 4 ++++ tools/docker/Ubuntu/conformance.dockerfile | 10 +++------- tools/docker/Ubuntu/distro.dockerfile | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/docker/Ubuntu/22_04.dockerfile b/tools/docker/Ubuntu/22_04.dockerfile index 94a94dc01..12b1e714e 100644 --- a/tools/docker/Ubuntu/22_04.dockerfile +++ b/tools/docker/Ubuntu/22_04.dockerfile @@ -11,6 +11,10 @@ ENV TERM=dumb ENV TZ=Etc/UTC ENV DEBIAN_FRONTEND=noninteractive +# these are only necessary for 22.04 to upgrade ocl-icd to 2.3.x (which supports OpenCL 3.0) +COPY ocl-icd-ubuntu-ppa.list /etc/apt/sources.list.d/ +COPY ocl-icd_ubuntu_ppa.gpg /etc/apt/trusted.gpg.d/ + RUN apt update RUN apt upgrade -y diff --git a/tools/docker/Ubuntu/conformance.dockerfile b/tools/docker/Ubuntu/conformance.dockerfile index 37b29d8c0..3af7ff0eb 100644 --- a/tools/docker/Ubuntu/conformance.dockerfile +++ b/tools/docker/Ubuntu/conformance.dockerfile @@ -1,11 +1,11 @@ ################### -FROM amd64/ubuntu:22.04 +FROM amd64/ubuntu:24.04 ARG GIT_COMMIT=main ARG GH_PR ARG GH_SLUG=pocl/pocl -ARG LLVM_VERSION=14 +ARG LLVM_VERSION=17 LABEL git-commit=$GIT_COMMIT vendor=pocl distro=Ubuntu version=1.0 @@ -13,15 +13,11 @@ ENV TERM=dumb ENV TZ=Etc/UTC ENV DEBIAN_FRONTEND=noninteractive -COPY ocl-icd-ubuntu-ppa.list /etc/apt/sources.list.d/ -COPY ocl-icd_ubuntu_ppa.gpg /etc/apt/trusted.gpg.d/ - RUN apt update RUN apt upgrade -y RUN apt install -y tzdata -RUN apt install -y build-essential cmake git pkg-config libclang-${LLVM_VERSION}-dev clang-${LLVM_VERSION} libclang-cpp${LLVM_VERSION}-dev llvm-${LLVM_VERSION}-dev make ninja-build ocl-icd-libopencl1 ocl-icd-dev libhwloc-dev zlib1g zlib1g-dev dialog apt-utils -RUN ln -s /usr/lib/x86_64-linux-gnu/libOpenCL.so.1 /usr/lib/x86_64-linux-gnu/libOpenCL.so +RUN apt install -y build-essential cmake git pkg-config libclang-${LLVM_VERSION}-dev clang-${LLVM_VERSION} libclang-cpp${LLVM_VERSION}-dev llvm-${LLVM_VERSION}-dev libllvmspirvlib-${LLVM_VERSION}-dev make ninja-build ocl-icd-libopencl1 ocl-icd-dev libhwloc-dev zlib1g zlib1g-dev dialog apt-utils RUN cd /home ; git clone https://github.com/$GH_SLUG.git ; cd /home/pocl ; git checkout $GIT_COMMIT RUN cd /home/pocl ; test -z "$GH_PR" || (git fetch origin +refs/pull/$GH_PR/merge && git checkout -qf FETCH_HEAD) && : diff --git a/tools/docker/Ubuntu/distro.dockerfile b/tools/docker/Ubuntu/distro.dockerfile index b9dbcfdab..c77706c08 100644 --- a/tools/docker/Ubuntu/distro.dockerfile +++ b/tools/docker/Ubuntu/distro.dockerfile @@ -1,9 +1,9 @@ -FROM amd64/ubuntu:22.04 +FROM amd64/ubuntu:24.04 ARG GIT_COMMIT=main ARG GH_PR ARG GH_SLUG=pocl/pocl -ARG LLVM_VERSION=13 +ARG LLVM_VERSION=17 LABEL git-commit=$GIT_COMMIT vendor=pocl distro=Ubuntu version=1.0 -- GitLab