Skip to content

Commit 85e7f27

Browse files
author
Piotr Stankiewicz
committed
Fix vulkan SDK install on linux/arm64
Signed-off-by: Piotr Stankiewicz <piotr.stankiewicz@docker.com>
1 parent 0b3ad1a commit 85e7f27

File tree

2 files changed

+17
-3
lines changed

2 files changed

+17
-3
lines changed

Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
ARG GO_VERSION=1.24
44
ARG LLAMA_SERVER_VERSION=latest
55
ARG LLAMA_SERVER_VARIANT=cpu
6-
ARG TARGETARCH=${BUILDARCH}
76
ARG LLAMA_BINARY_PATH=/com.docker.llama-server.native.linux.${LLAMA_SERVER_VARIANT}.${TARGETARCH}
87
ARG BASE_IMAGE=ubuntu:24.04
98

scripts/apt-install.sh

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,25 @@ main() {
1010
local vulkan_version=1.4.321.1
1111
local arch
1212
arch=$(uname -m)
13+
apt-get install -y wget xz-utils
1314
wget -qO /tmp/vulkan-sdk.tar.xz https://sdk.lunarg.com/sdk/download/$vulkan_version/linux/vulkan-sdk-linux-"$arch"-$vulkan_version.tar.xz
1415
mkdir -p /opt/vulkan
15-
tar -xf /tmp/vulkan-sdk.tar.xz -C /tmp --strip-components=1
16-
mv /tmp/"$arch"/* /opt/vulkan/
16+
tar -xf /tmp/vulkan-sdk.tar.xz -C /tmp
17+
18+
if [ "$arch" != "x86_64" ]; then
19+
# TODO: uninstall build time deps after building the SDK
20+
apt-get install -y libglm-dev cmake libxcb-dri3-0 libxcb-present0 libpciaccess0 \
21+
libpng-dev libxcb-keysyms1-dev libxcb-dri3-dev libx11-dev g++ gcc \
22+
libwayland-dev libxrandr-dev libxcb-randr0-dev libxcb-ewmh-dev \
23+
git python-is-python3 bison libx11-xcb-dev liblz4-dev libzstd-dev \
24+
ocaml-core ninja-build pkg-config libxml2-dev wayland-protocols python3-jsonschema \
25+
clang-format qtbase5-dev qt6-base-dev
26+
pushd /tmp/"${vulkan_version}"
27+
# TODO: we don't need the whole SDK to run stuff, so eventually only build necessary targets here
28+
./vulkansdk --no-deps -j "$(nproc)"
29+
fi
30+
31+
mv /tmp/"${vulkan_version}"/"$arch"/* /opt/vulkan/
1732
rm -rf /tmp/*
1833
fi
1934

0 commit comments

Comments
 (0)