From 74af43e4f84ac2e7a3ea91badab6c1c96b9e5032 Mon Sep 17 00:00:00 2001 From: Romain BOULLARD Date: Fri, 4 Sep 2026 07:52:50 +0200 Subject: [PATCH] Fix merge conflict --- Linux/CPPBuilder/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Linux/CPPBuilder/Dockerfile b/Linux/CPPBuilder/Dockerfile index 41cbe2b..cce53f8 100644 --- a/Linux/CPPBuilder/Dockerfile +++ b/Linux/CPPBuilder/Dockerfile @@ -31,14 +31,14 @@ RUN VERSION=1.3.0; \ RUN pipx install conan \ && pipx install gcovr -# Install Vulkan SDK 1.4.341.0 -RUN wget -q https://sdk.lunarg.com/sdk/download/1.4.341.0/linux/vulkansdk-linux-x86_64-1.4.341.0.tar.xz \ +# Install Vulkan SDK 1.4.350.0 +RUN wget -q https://sdk.lunarg.com/sdk/download/1.4.350.0/linux/vulkansdk-linux-x86_64-1.4.350.0.tar.xz \ -O /tmp/vulkansdk.tar.xz \ && mkdir -p /opt/vulkan \ && tar -xf /tmp/vulkansdk.tar.xz -C /opt/vulkan \ && rm /tmp/vulkansdk.tar.xz -ENV VULKAN_SDK=/opt/vulkan/1.4.341.0/x86_64 +ENV VULKAN_SDK=/opt/vulkan/1.4.350.0/x86_64 ENV PATH="${VULKAN_SDK}/bin:${PATH}" ENV LD_LIBRARY_PATH="${VULKAN_SDK}/lib:${LD_LIBRARY_PATH}" ENV VK_LAYER_PATH="${VULKAN_SDK}/share/vulkan/explicit_layer.d"