michael/scrypted
1
0
Fork 0
mirror of https://github.com/koush/scrypted.git synced 2026-07-04 06:40:29 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

linux: move intel stuff out since it requires jammy

Browse Source
This commit is contained in:
Koushik Dutta
2023-06-08 11:47:06 -07:00
parent 91e2c2870b
commit adcd9fa537
4 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
install/docker/Dockerfile.full
View File

@@ -42,17 +42,6 @@ RUN echo "deb https://packages.cloud.google.com/apt coral-edgetpu-stable main" |
RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add -
RUN apt-get -y update && apt-get -y install libedgetpu1-std
# intel opencl gpu for openvino
RUN bash -c "if [ \"$(uname -m)\" == \"x86_64\" ]; \
then \
apt-get install -y gpg-agent && \
rm -f /usr/share/keyrings/intel-graphics.gpg && \
wget -qO - https://repositories.intel.com/graphics/intel-graphics.key | gpg --dearmor --output /usr/share/keyrings/intel-graphics.gpg && \
echo 'deb [arch=amd64,i386 signed-by=/usr/share/keyrings/intel-graphics.gpg] https://repositories.intel.com/graphics/ubuntu jammy arc' | tee /etc/apt/sources.list.d/intel.gpu.jammy.list && \
apt-get -y install \
intel-opencl-icd; \
fi"
# these are necessary for pillow-simd, additional on disk size is small
# but could consider removing this.
RUN apt-get -y install \
@@ -109,6 +98,17 @@ RUN for v in 3 3.9; \
################################################################
FROM header as base
# intel opencl gpu for openvino
RUN if [ \"$(uname -m)\" == \"x86_64\" ]; \
then \
apt-get install -y gpg-agent && \
rm -f /usr/share/keyrings/intel-graphics.gpg && \
wget -qO - https://repositories.intel.com/graphics/intel-graphics.key | gpg --dearmor --output /usr/share/keyrings/intel-graphics.gpg && \
echo 'deb [arch=amd64,i386 signed-by=/usr/share/keyrings/intel-graphics.gpg] https://repositories.intel.com/graphics/ubuntu jammy arc' | tee /etc/apt/sources.list.d/intel.gpu.jammy.list && \
apt-get -y install \
intel-opencl-icd; \
fi
ENV SCRYPTED_INSTALL_ENVIRONMENT="docker"
ENV SCRYPTED_CAN_RESTART="true"
ENV SCRYPTED_VOLUME="/server/volume"

11
install/docker/template/Dockerfile.full.footer
View File

@@ -3,6 +3,17 @@
################################################################
FROM header as base
# intel opencl gpu for openvino
RUN if [ \"$(uname -m)\" == \"x86_64\" ]; \
then \
apt-get install -y gpg-agent && \
rm -f /usr/share/keyrings/intel-graphics.gpg && \
wget -qO - https://repositories.intel.com/graphics/intel-graphics.key | gpg --dearmor --output /usr/share/keyrings/intel-graphics.gpg && \
echo 'deb [arch=amd64,i386 signed-by=/usr/share/keyrings/intel-graphics.gpg] https://repositories.intel.com/graphics/ubuntu jammy arc' | tee /etc/apt/sources.list.d/intel.gpu.jammy.list && \
apt-get -y install \
intel-opencl-icd; \
fi
ENV SCRYPTED_INSTALL_ENVIRONMENT="docker"
ENV SCRYPTED_CAN_RESTART="true"
ENV SCRYPTED_VOLUME="/server/volume"

11
install/docker/template/Dockerfile.full.header
View File

@@ -39,17 +39,6 @@ RUN echo "deb https://packages.cloud.google.com/apt coral-edgetpu-stable main" |
RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add -
RUN apt-get -y update && apt-get -y install libedgetpu1-std
# intel opencl gpu for openvino
RUN bash -c "if [ \"$(uname -m)\" == \"x86_64\" ]; \
then \
apt-get install -y gpg-agent && \
rm -f /usr/share/keyrings/intel-graphics.gpg && \
wget -qO - https://repositories.intel.com/graphics/intel-graphics.key | gpg --dearmor --output /usr/share/keyrings/intel-graphics.gpg && \
echo 'deb [arch=amd64,i386 signed-by=/usr/share/keyrings/intel-graphics.gpg] https://repositories.intel.com/graphics/ubuntu jammy arc' | tee /etc/apt/sources.list.d/intel.gpu.jammy.list && \
apt-get -y install \
intel-opencl-icd; \
fi"
# these are necessary for pillow-simd, additional on disk size is small
# but could consider removing this.
RUN apt-get -y install \

2
install/local/install-scrypted-dependencies-linux.sh
View File

@@ -19,7 +19,7 @@ systemctl stop scrypted.service
RUN() {
# echo "Running: $@"
"$@"
$@
if [ $? -ne 0 ]
then
echo 'Error during previous command.'