From 132442da2655beefc7acf609b8b350736acd76d9 Mon Sep 17 00:00:00 2001 From: Nick Mowen Date: Fri, 16 Dec 2022 07:17:39 -0700 Subject: [PATCH] remove unused --- Dockerfile | 50 +++++++++++++++++++++++++++++++++--- web/src/routes/Recording.jsx | 8 +----- 2 files changed, 48 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3999ff1f9..f0eea212a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,9 +9,6 @@ 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 RUN apt-get update \ @@ -19,6 +16,53 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* 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 diff --git a/web/src/routes/Recording.jsx b/web/src/routes/Recording.jsx index 67412781e..418b0d7ed 100644 --- a/web/src/routes/Recording.jsx +++ b/web/src/routes/Recording.jsx @@ -7,7 +7,6 @@ import RecordingPlaylist from '../components/RecordingPlaylist'; import VideoPlayer from '../components/VideoPlayer'; import { useApiHost } from '../api'; import useSWR from 'swr'; -import axios from 'axios'; export default function Recording({ camera, date, hour = '00', minute = '00', second = '00' }) { const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone; @@ -99,13 +98,8 @@ export default function Recording({ camera, date, hour = '00', minute = '00', se useEffect(() => { if (this.player) { this.player.playlist.currentItem(playlistIndex); - - // prime next item in playlist - if (playlistIndex < playlist.length - 1) { - axios.get(playlist?.get(playlistIndex + 1)) - } } - }, [playlist, playlistIndex]); + }, [playlistIndex]); useEffect(() => { if (this.player) {