From 5749a522dbbc7619d4fb1980fb646a36d923ddcf Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Thu, 30 Oct 2025 08:31:11 -0700 Subject: [PATCH] docker: move amd opencl into amd image only --- install/docker/Dockerfile.HEAD | 4 ++-- install/docker/Dockerfile.amd | 2 +- install/docker/Dockerfile.full | 7 ++----- install/docker/Dockerfile.intel | 2 +- install/docker/Dockerfile.lite | 2 +- install/docker/Dockerfile.nvidia | 2 +- install/docker/Dockerfile.nvidia-legacy | 2 +- install/docker/Dockerfile.s6 | 2 +- install/docker/docker-build-nvidia.sh | 2 +- install/docker/docker-build.sh | 2 +- install/docker/template/Dockerfile.full.footer | 5 +---- 11 files changed, 13 insertions(+), 19 deletions(-) diff --git a/install/docker/Dockerfile.HEAD b/install/docker/Dockerfile.HEAD index 8273ae82d..388645ab7 100644 --- a/install/docker/Dockerfile.HEAD +++ b/install/docker/Dockerfile.HEAD @@ -1,4 +1,4 @@ -ARG BASE="16-jammy" +ARG BASE="noble-full" FROM ghcr.io/koush/scrypted-common:${BASE} WORKDIR / @@ -8,4 +8,4 @@ WORKDIR /scrypted/server RUN npm install RUN npm run build -CMD npm run serve-no-build +CMD ["npm", "run", "serve-no-build"] diff --git a/install/docker/Dockerfile.amd b/install/docker/Dockerfile.amd index dd11005d1..1e8856c1c 100644 --- a/install/docker/Dockerfile.amd +++ b/install/docker/Dockerfile.amd @@ -1,4 +1,4 @@ -ARG BASE="ghcr.io/koush/scrypted-common:20-jammy-full" +ARG BASE="ghcr.io/koush/scrypted-common:noble-amd" FROM $BASE ENV SCRYPTED_DOCKER_FLAVOR="amd" diff --git a/install/docker/Dockerfile.full b/install/docker/Dockerfile.full index d5733b69b..adaad7474 100644 --- a/install/docker/Dockerfile.full +++ b/install/docker/Dockerfile.full @@ -66,15 +66,12 @@ FROM header AS base # vulkan RUN apt -y install libvulkan1 -# intel opencl for openvino +# intel GPU RUN curl https://raw.githubusercontent.com/koush/scrypted/main/install/docker/install-intel-graphics.sh | bash -# NPU driver will SIGILL on openvino prior to 2024.5.0 +# intel NPU RUN curl https://raw.githubusercontent.com/koush/scrypted/main/install/docker/install-intel-npu.sh | bash -# amd opencl -RUN curl https://raw.githubusercontent.com/koush/scrypted/main/install/docker/install-amd-graphics.sh | bash - # python 3.9 from ppa. # 3.9 is the version with prebuilt support for tensorflow lite RUN add-apt-repository -y ppa:deadsnakes/ppa && \ diff --git a/install/docker/Dockerfile.intel b/install/docker/Dockerfile.intel index 41be82ce6..2fb251e34 100644 --- a/install/docker/Dockerfile.intel +++ b/install/docker/Dockerfile.intel @@ -1,4 +1,4 @@ -ARG BASE="ghcr.io/koush/scrypted-common:20-jammy-full" +ARG BASE="ghcr.io/koush/scrypted-common:noble-intel" FROM $BASE ENV SCRYPTED_DOCKER_FLAVOR="intel" diff --git a/install/docker/Dockerfile.lite b/install/docker/Dockerfile.lite index bde76b4ae..cb4721246 100644 --- a/install/docker/Dockerfile.lite +++ b/install/docker/Dockerfile.lite @@ -1,4 +1,4 @@ -ARG BASE="jammy" +ARG BASE="noble-lite" FROM ubuntu:${BASE} AS header ENV SCRYPTED_DOCKER_FLAVOR="lite" diff --git a/install/docker/Dockerfile.nvidia b/install/docker/Dockerfile.nvidia index 0318ce134..4d8679e3c 100644 --- a/install/docker/Dockerfile.nvidia +++ b/install/docker/Dockerfile.nvidia @@ -1,4 +1,4 @@ -ARG BASE="ghcr.io/koush/scrypted-common:20-jammy-full" +ARG BASE="ghcr.io/koush/scrypted-common:noble-nvidia" FROM $BASE ENV SCRYPTED_DOCKER_FLAVOR="nvidia" diff --git a/install/docker/Dockerfile.nvidia-legacy b/install/docker/Dockerfile.nvidia-legacy index d946ce164..b2ca3aa95 100644 --- a/install/docker/Dockerfile.nvidia-legacy +++ b/install/docker/Dockerfile.nvidia-legacy @@ -1,4 +1,4 @@ -ARG BASE="ghcr.io/koush/scrypted-common:20-jammy-full" +ARG BASE="ghcr.io/koush/scrypted-common:noble-nvidia-legacy" FROM $BASE ENV SCRYPTED_DOCKER_FLAVOR="nvidia" diff --git a/install/docker/Dockerfile.s6 b/install/docker/Dockerfile.s6 index 797c05f4d..a914424ff 100644 --- a/install/docker/Dockerfile.s6 +++ b/install/docker/Dockerfile.s6 @@ -1,4 +1,4 @@ -ARG BASE="20-jammy-full" +ARG BASE="noble-full" FROM ghcr.io/koush/scrypted-common:${BASE} # avahi advertiser support diff --git a/install/docker/docker-build-nvidia.sh b/install/docker/docker-build-nvidia.sh index 4be5f501a..20861ec55 100755 --- a/install/docker/docker-build-nvidia.sh +++ b/install/docker/docker-build-nvidia.sh @@ -1,3 +1,3 @@ ./docker-build.sh -docker build -t ghcr.io/koush/scrypted:20-jammy-full.nvidia -f Dockerfile.nvidia . \ No newline at end of file +docker build -t ghcr.io/koush/scrypted:nvidia -f Dockerfile.nvidia . \ No newline at end of file diff --git a/install/docker/docker-build.sh b/install/docker/docker-build.sh index 057e6243c..7325329b1 100755 --- a/install/docker/docker-build.sh +++ b/install/docker/docker-build.sh @@ -4,7 +4,7 @@ set -x NODE_VERSION=22 SCRYPTED_INSTALL_VERSION=beta -IMAGE_BASE=jammy +IMAGE_BASE=noble FLAVOR=full BASE=$NODE_VERSION-$IMAGE_BASE-$FLAVOR echo $BASE diff --git a/install/docker/template/Dockerfile.full.footer b/install/docker/template/Dockerfile.full.footer index 0fc0bdbeb..29585dc89 100644 --- a/install/docker/template/Dockerfile.full.footer +++ b/install/docker/template/Dockerfile.full.footer @@ -9,12 +9,9 @@ RUN apt -y install libvulkan1 # intel opencl for openvino RUN curl https://raw.githubusercontent.com/koush/scrypted/main/install/docker/install-intel-graphics.sh | bash -# NPU driver will SIGILL on openvino prior to 2024.5.0 +# intel NPU RUN curl https://raw.githubusercontent.com/koush/scrypted/main/install/docker/install-intel-npu.sh | bash -# amd opencl -RUN curl https://raw.githubusercontent.com/koush/scrypted/main/install/docker/install-amd-graphics.sh | bash - # python 3.9 from ppa. # 3.9 is the version with prebuilt support for tensorflow lite RUN add-apt-repository -y ppa:deadsnakes/ppa && \