diff --git a/Dockerfile b/Dockerfile index 4bc1368c7..3999ff1f9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,6 +9,8 @@ FROM --platform=linux/amd64 debian:11 AS base_amd64 FROM debian:11-slim AS slim-base +FROM blakeblackshear/frigate-nginx:1.0.2 AS nginx + FROM slim-base AS wget ARG DEBIAN_FRONTEND @@ -18,55 +20,6 @@ RUN apt-get update \ WORKDIR /rootfs -FROM ubuntu:20.04 AS nginx -ARG DEBIAN_FRONTEND -ARG NGINX_VERSION=1.22.1 -ARG VOD_MODULE_VERSION=1.30 -ARG SECURE_TOKEN_MODULE_VERSION=1.4 -ARG RTMP_MODULE_VERSION=1.2.1 - -RUN cp /etc/apt/sources.list /etc/apt/sources.list~ \ - && sed -Ei 's/^# deb-src /deb-src /' /etc/apt/sources.list \ - && apt-get update - -RUN apt-get -yqq build-dep nginx - -RUN apt-get -yqq install --no-install-recommends ca-certificates wget \ - && mkdir /tmp/nginx \ - && wget https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz \ - && tar -zxf nginx-${NGINX_VERSION}.tar.gz -C /tmp/nginx --strip-components=1 \ - && rm nginx-${NGINX_VERSION}.tar.gz \ - && mkdir /tmp/nginx-vod-module \ - && wget https://github.com/kaltura/nginx-vod-module/archive/refs/tags/${VOD_MODULE_VERSION}.tar.gz \ - && tar -zxf ${VOD_MODULE_VERSION}.tar.gz -C /tmp/nginx-vod-module --strip-components=1 \ - && rm ${VOD_MODULE_VERSION}.tar.gz \ - # Patch MAX_CLIPS to allow more clips to be added than the default 128 - && sed -i 's/MAX_CLIPS (128)/MAX_CLIPS (1080)/g' /tmp/nginx-vod-module/vod/media_set.h \ - && mkdir /tmp/nginx-secure-token-module \ - && wget https://github.com/kaltura/nginx-secure-token-module/archive/refs/tags/${SECURE_TOKEN_MODULE_VERSION}.tar.gz \ - && tar -zxf ${SECURE_TOKEN_MODULE_VERSION}.tar.gz -C /tmp/nginx-secure-token-module --strip-components=1 \ - && rm ${SECURE_TOKEN_MODULE_VERSION}.tar.gz \ - && mkdir /tmp/nginx-rtmp-module \ - && wget https://github.com/arut/nginx-rtmp-module/archive/refs/tags/v${RTMP_MODULE_VERSION}.tar.gz \ - && tar -zxf v${RTMP_MODULE_VERSION}.tar.gz -C /tmp/nginx-rtmp-module --strip-components=1 \ - && rm v${RTMP_MODULE_VERSION}.tar.gz - -WORKDIR /tmp/nginx - -RUN ./configure --prefix=/usr/local/nginx \ - --with-file-aio \ - --with-http_sub_module \ - --with-http_ssl_module \ - --with-threads \ - --add-module=../nginx-vod-module \ - --add-module=../nginx-secure-token-module \ - --add-module=../nginx-rtmp-module \ - --with-cc-opt="-O3 -Wno-error=implicit-fallthrough" - -RUN make && make install -RUN rm -rf /usr/local/nginx/html /usr/local/nginx/conf/*.default - - FROM wget AS go2rtc ARG TARGETARCH WORKDIR /rootfs/usr/local/go2rtc/bin @@ -126,8 +79,8 @@ RUN wget -qO edgetpu_model.tflite https://github.com/google-coral/test_data/raw/ RUN wget -qO cpu_model.tflite https://github.com/google-coral/test_data/raw/release-frogfish/ssdlite_mobiledet_coco_qat_postprocess.tflite COPY labelmap.txt . # Copy OpenVino model -#COPY --from=ov-converter /models/public/ssdlite_mobilenet_v2/FP16 openvino-model -#RUN wget -q https://github.com/openvinotoolkit/open_model_zoo/raw/master/data/dataset_classes/coco_91cl_bkgr.txt -O openvino-model/coco_91cl_bkgr.txt +COPY --from=ov-converter /models/public/ssdlite_mobilenet_v2/FP16 openvino-model +RUN wget -q https://github.com/openvinotoolkit/open_model_zoo/raw/master/data/dataset_classes/coco_91cl_bkgr.txt -O openvino-model/coco_91cl_bkgr.txt diff --git a/docker-compose.yml b/docker-compose.yml index 4e6b1d447..3ed08493c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,8 +12,8 @@ services: build: context: . target: devcontainer -# devices: -# - /dev/bus/usb:/dev/bus/usb + devices: + - /dev/bus/usb:/dev/bus/usb # - /dev/dri:/dev/dri # for intel hwaccel, needs to be updated for your hardware volumes: - .:/workspace/frigate:cached @@ -21,7 +21,7 @@ services: - /etc/localtime:/etc/localtime:ro - ./config/config.yml:/config/config.yml:ro - ./debug:/media/frigate -# - /dev/bus/usb:/dev/bus/usb + - /dev/bus/usb:/dev/bus/usb mqtt: container_name: mqtt image: eclipse-mosquitto:1.6