diff --git a/docker-builders/KomputeBuilder.Dockerfile b/docker-builders/KomputeBuilder.Dockerfile index 12978306..c8eb7938 100644 --- a/docker-builders/KomputeBuilder.Dockerfile +++ b/docker-builders/KomputeBuilder.Dockerfile @@ -7,7 +7,7 @@ FROM axsauze/vulkan-sdk:${VULKAN_SDK_VERSION} as vulkansdk-image FROM axsauze/swiftshader:${SWIFTSHADER_VERSION} as swiftshader-image # Ubuntu as actual image base -FROM ubuntu:22.04 +FROM ubuntu:23.10 # Repeating args for context in this image ARG VULKAN_SDK_VERSION diff --git a/docker-builders/Makefile b/docker-builders/Makefile index ef4e7b42..30b15844 100644 --- a/docker-builders/Makefile +++ b/docker-builders/Makefile @@ -1,7 +1,7 @@ -KOMPUTE_BUILDER_VERSION=0.4 -SWIFTSHADER_VERSION=0.2 -VULKAN_SDK_VERSION=1.3.231.2 +KOMPUTE_BUILDER_VERSION=0.5 +SWIFTSHADER_VERSION=0.3 +VULKAN_SDK_VERSION=1.3.275.0 build_kompute_builder: docker build .. \ diff --git a/docker-builders/Swiftshader.Dockerfile b/docker-builders/Swiftshader.Dockerfile index cc381c5a..cab6c931 100644 --- a/docker-builders/Swiftshader.Dockerfile +++ b/docker-builders/Swiftshader.Dockerfile @@ -5,7 +5,7 @@ ARG VULKAN_SDK_VERSION FROM axsauze/vulkan-sdk:$VULKAN_SDK_VERSION as vulkansdk-image # Ubuntu as actual image base -FROM ubuntu:22.04 as swiftshader-builder +FROM ubuntu:23.10 as swiftshader-builder # Repeating ARG for context in this image ARG VULKAN_SDK_VERSION @@ -43,7 +43,7 @@ RUN cp -r swiftshader-build/build/Linux/ swiftshader/ # Store build in slim down image -FROM ubuntu:22.04 +FROM ubuntu:23.10 COPY --from=swiftshader-builder /swiftshader/ /swiftshader/ diff --git a/docker-builders/VulkanSDK.Dockerfile b/docker-builders/VulkanSDK.Dockerfile index 54b8d090..e0a5d096 100644 --- a/docker-builders/VulkanSDK.Dockerfile +++ b/docker-builders/VulkanSDK.Dockerfile @@ -5,10 +5,13 @@ ARG VULKAN_SDK_VERSION # First install vulkan RUN apt-get update RUN apt-get install -y curl unzip tar wget -RUN wget -O VulkanSDK.tar.gz https://sdk.lunarg.com/sdk/download/${VULKAN_SDK_VERSION}/linux/vulkansdk-linux-x86_64-${VULKAN_SDK_VERSION}.tar.gz?u=true && \ - mkdir VulkanSDK && \ +RUN wget -O VulkanSDK.tar.xz https://sdk.lunarg.com/sdk/download/${VULKAN_SDK_VERSION}/linux/vulkansdk-linux-x86_64-${VULKAN_SDK_VERSION}.tar.xz?u=true + +RUN apt install -y xz-utils + +RUN mkdir VulkanSDK && \ cd VulkanSDK && \ - tar xvf /VulkanSDK.tar.gz + tar xvf /VulkanSDK.tar.xz RUN cd VulkanSDK/${VULKAN_SDK_VERSION} ENV VULKAN_SDK="/VulkanSDK/${VULKAN_SDK_VERSION}/x86_64" @@ -59,7 +62,8 @@ RUN apt-get install -y qt5-qmake # Python deps RUN pip install jsonschema -RUN /VulkanSDK/${VULKAN_SDK_VERSION}/vulkansdk -j $(nproc) +RUN apt-get install -y sudo +RUN /VulkanSDK/${VULKAN_SDK_VERSION}/vulkansdk -j $(nproc) -y # Cleanup to reduce image size RUN rm -rf /VulkanSDK/${VULKAN_SDK_VERSION}/source @@ -68,7 +72,7 @@ RUN mkdir /workspace WORKDIR /workspace # Store build in slim down image (reduce from 16GB to 1GB) -FROM ubuntu:20.04 +FROM ubuntu:23.10 ARG VULKAN_SDK_VERSION