docker: move amd opencl into amd image only

This commit is contained in:
Koushik Dutta
2025-10-30 08:31:11 -07:00
parent 38037d31b3
commit 5749a522db
11 changed files with 13 additions and 19 deletions

View File

@@ -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"]

View File

@@ -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"

View File

@@ -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 && \

View File

@@ -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"

View File

@@ -1,4 +1,4 @@
ARG BASE="jammy"
ARG BASE="noble-lite"
FROM ubuntu:${BASE} AS header
ENV SCRYPTED_DOCKER_FLAVOR="lite"

View File

@@ -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"

View File

@@ -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"

View File

@@ -1,4 +1,4 @@
ARG BASE="20-jammy-full"
ARG BASE="noble-full"
FROM ghcr.io/koush/scrypted-common:${BASE}
# avahi advertiser support

View File

@@ -1,3 +1,3 @@
./docker-build.sh
docker build -t ghcr.io/koush/scrypted:20-jammy-full.nvidia -f Dockerfile.nvidia .
docker build -t ghcr.io/koush/scrypted:nvidia -f Dockerfile.nvidia .

View File

@@ -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

View File

@@ -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 && \