install the latest vulkan sdk from tarball
lunarg no longer updates ubuntu packages, and those are stale
This commit is contained in:
+24
-5
@@ -2,16 +2,14 @@ FROM ubuntu-hlsdk
|
|||||||
|
|
||||||
# Avoid interactive prompts during package installation
|
# Avoid interactive prompts during package installation
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
|
ENV VULKAN_SDK_VERSION=1.4.341.1
|
||||||
|
|
||||||
USER root
|
USER root
|
||||||
|
|
||||||
# Install Vulkan SDK repos
|
RUN apt-get update && apt-get full-upgrade -y && apt-get autoremove -y
|
||||||
RUN wget -qO- https://packages.lunarg.com/lunarg-signing-key-pub.asc | tee /etc/apt/trusted.gpg.d/lunarg.asc \
|
|
||||||
&& wget -qO /etc/apt/sources.list.d/lunarg-vulkan-noble.list http://packages.lunarg.com/vulkan/lunarg-vulkan-noble.list
|
|
||||||
|
|
||||||
# Install system dependencies and development packages
|
# Install system dependencies and development packages
|
||||||
RUN apt-get update && apt-get install --no-install-recommends --no-install-suggests -y \
|
RUN apt-get install --no-install-recommends --no-install-suggests -y \
|
||||||
vulkan-sdk \
|
|
||||||
libsdl2-dev \
|
libsdl2-dev \
|
||||||
libfreetype-dev \
|
libfreetype-dev \
|
||||||
\
|
\
|
||||||
@@ -33,6 +31,27 @@ RUN apt-get update && apt-get install --no-install-recommends --no-install-sugge
|
|||||||
libvulkan1 \
|
libvulkan1 \
|
||||||
imagemagick
|
imagemagick
|
||||||
|
|
||||||
|
# Install Vulkan SDK runtime dependencies only
|
||||||
|
#RUN apt-get update && apt-get install -y \
|
||||||
|
# libxcb-xinput0 libxcb-xinerama0 libxcb-cursor-dev
|
||||||
|
|
||||||
|
# Install Vulkan SDK
|
||||||
|
RUN mkdir -p /opt/VulkanSDK && wget -qO- \
|
||||||
|
https://sdk.lunarg.com/sdk/download/${VULKAN_SDK_VERSION}/linux/vulkansdk-linux-x86_64-${VULKAN_SDK_VERSION}.tar.xz | \
|
||||||
|
tar -xJ -C /opt/VulkanSDK/
|
||||||
|
|
||||||
|
ENV VULKAN_SDK=/opt/VulkanSDK/${VULKAN_SDK_VERSION}/x86_64
|
||||||
|
ENV PATH=$VULKAN_SDK/bin:$PATH
|
||||||
|
ENV LD_LIBRARY_PATH="$VULKAN_SDK/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
|
||||||
|
ENV VK_ADD_LAYER_PATH="$VULKAN_SDK/share/vulkan/explicit_layer.d${VK_ADD_LAYER_PATH:+:$VK_ADD_LAYER_PATH}"
|
||||||
|
ENV PKG_CONFIG_PATH="$VULKAN_SDK/share/pkgconfig:$VULKAN_SDK/lib/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}"
|
||||||
|
|
||||||
|
# Common dev utils
|
||||||
|
RUN apt-get install --no-install-recommends --no-install-suggests -y \
|
||||||
|
ripgrep \
|
||||||
|
less \
|
||||||
|
fd-find
|
||||||
|
|
||||||
# Remove extra cache after all the installations
|
# Remove extra cache after all the installations
|
||||||
RUN rm -rf /var/lib/apt/lists/*
|
RUN rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
|||||||
@@ -150,7 +150,7 @@ def render():
|
|||||||
print('Running xash3d...')
|
print('Running xash3d...')
|
||||||
mkdir_p(f'{args.xash_dir}/valve/rendertest')
|
mkdir_p(f'{args.xash_dir}/valve/rendertest')
|
||||||
env = os.environ.copy()
|
env = os.environ.copy()
|
||||||
env['LD_LIBRARY_PATH'] = f'{args.xash_dir}'
|
env['LD_LIBRARY_PATH'] = f'{args.xash_dir}:{env["LD_LIBRARY_PATH"]}'
|
||||||
|
|
||||||
start_time_sec = time.perf_counter()
|
start_time_sec = time.perf_counter()
|
||||||
with open(f'{WORKDIR}/xash-stdout.log', 'wb') as stdout, open(f'{WORKDIR}/xash-stderr.log', 'wb') as stderr:
|
with open(f'{WORKDIR}/xash-stdout.log', 'wb') as stdout, open(f'{WORKDIR}/xash-stderr.log', 'wb') as stderr:
|
||||||
|
|||||||
Reference in New Issue
Block a user