diff --git a/install/docker/Dockerfile.full b/install/docker/Dockerfile.full index 0c247c2d6..3e67364c8 100644 --- a/install/docker/Dockerfile.full +++ b/install/docker/Dockerfile.full @@ -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" diff --git a/install/docker/template/Dockerfile.full.footer b/install/docker/template/Dockerfile.full.footer index 41babdf88..1faa90570 100644 --- a/install/docker/template/Dockerfile.full.footer +++ b/install/docker/template/Dockerfile.full.footer @@ -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" diff --git a/install/docker/template/Dockerfile.full.header b/install/docker/template/Dockerfile.full.header index 462df134d..b10e843a6 100644 --- a/install/docker/template/Dockerfile.full.header +++ b/install/docker/template/Dockerfile.full.header @@ -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 \ diff --git a/install/local/install-scrypted-dependencies-linux.sh b/install/local/install-scrypted-dependencies-linux.sh index 60db004ab..6f1a4d530 100755 --- a/install/local/install-scrypted-dependencies-linux.sh +++ b/install/local/install-scrypted-dependencies-linux.sh @@ -19,7 +19,7 @@ systemctl stop scrypted.service RUN() { # echo "Running: $@" - "$@" + $@ if [ $? -ne 0 ] then echo 'Error during previous command.'