Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker-builders/KomputeBuilder.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions docker-builders/Makefile
Original file line number Diff line number Diff line change
@@ -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 .. \
Expand Down
4 changes: 2 additions & 2 deletions docker-builders/Swiftshader.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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/

14 changes: 9 additions & 5 deletions docker-builders/VulkanSDK.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand All @@ -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

Expand Down