From 754db7e8b94083054f8f541e846c85f4f812c675 Mon Sep 17 00:00:00 2001 From: IrosTheBeggar Date: Tue, 7 Jul 2026 19:45:58 -0400 Subject: [PATCH] rebase to alpine 3.24, use distro onnxruntime for the discovery embedding runtime --- Dockerfile | 14 +++++++++++++- Dockerfile.aarch64 | 14 +++++++++++++- readme-vars.yml | 1 + 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4ea4884..989c57c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:3.23 +FROM ghcr.io/linuxserver/baseimage-alpine:3.24 # set version label ARG BUILD_DATE @@ -15,7 +15,9 @@ RUN \ echo "**** install runtime packages ****" && \ apk add --no-cache --upgrade \ ffmpeg \ + gcompat \ nodejs \ + onnxruntime \ openssl \ yt-dlp && \ apk add --no-cache --upgrade --virtual=build-dependencies \ @@ -36,6 +38,16 @@ RUN \ cd /app/mstream && \ chown -R abc:abc ./ && \ su -s /bin/sh abc -c 'HOME=/tmp npm install --omit=dev' && \ + echo "**** use distro onnxruntime for the discovery embedding runtime ****" && \ + if [ -d /app/mstream/node_modules/onnxruntime-node/bin/napi-v6/linux/x64 ]; then \ + rm -f \ + /app/mstream/node_modules/onnxruntime-node/bin/napi-v6/linux/x64/libonnxruntime.so.1 \ + /app/mstream/node_modules/onnxruntime-node/bin/napi-v6/linux/x64/libonnxruntime_providers_cuda.so \ + /app/mstream/node_modules/onnxruntime-node/bin/napi-v6/linux/x64/libonnxruntime_providers_tensorrt.so && \ + ln -s \ + /usr/lib/libonnxruntime.so.1 \ + /app/mstream/node_modules/onnxruntime-node/bin/napi-v6/linux/x64/libonnxruntime.so.1; \ + fi && \ npm link && \ chmod +x /app/mstream/bin/rust-parser/* && \ printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index e6f8be3..30b280f 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.23 +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.24 # set version label ARG BUILD_DATE @@ -15,7 +15,9 @@ RUN \ echo "**** install runtime packages ****" && \ apk add --no-cache --upgrade \ ffmpeg \ + gcompat \ nodejs \ + onnxruntime \ openssl \ yt-dlp && \ apk add --no-cache --upgrade --virtual=build-dependencies \ @@ -36,6 +38,16 @@ RUN \ cd /app/mstream && \ chown -R abc:abc ./ && \ su -s /bin/sh abc -c 'HOME=/tmp npm install --omit=dev' && \ + echo "**** use distro onnxruntime for the discovery embedding runtime ****" && \ + if [ -d /app/mstream/node_modules/onnxruntime-node/bin/napi-v6/linux/arm64 ]; then \ + rm -f \ + /app/mstream/node_modules/onnxruntime-node/bin/napi-v6/linux/arm64/libonnxruntime.so.1 \ + /app/mstream/node_modules/onnxruntime-node/bin/napi-v6/linux/arm64/libonnxruntime_providers_cuda.so \ + /app/mstream/node_modules/onnxruntime-node/bin/napi-v6/linux/arm64/libonnxruntime_providers_tensorrt.so && \ + ln -s \ + /usr/lib/libonnxruntime.so.1 \ + /app/mstream/node_modules/onnxruntime-node/bin/napi-v6/linux/arm64/libonnxruntime.so.1; \ + fi && \ npm link && \ chmod +x /app/mstream/bin/rust-parser/* && \ printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ diff --git a/readme-vars.yml b/readme-vars.yml index 2782d01..ee6dbbf 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -72,6 +72,7 @@ init_diagram: | "mstream:latest" <- Base Images # changelog changelogs: + - {date: "08.07.26:", desc: "Rebase to Alpine 3.24. Use the distro onnxruntime so the discovery/recommendation features work on musl."} - {date: "24.04.26:", desc: "Make waveform data persistent."} - {date: "20.04.26:", desc: "Fix perms on rust binaries."} - {date: "07.04.26:", desc: "Add ffmpeg and yt-dlp."}