administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-02-02 17:25:22 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'release-0.11.0' of https://github.com/blakeblackshear/frigate into mqtt-set-motion

Browse Source
This commit is contained in:
Nick Mowen 2022-04-26 06:25:18 -06:00
commit 9c6c40f512
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/Dockerfile
View File

@ -81,7 +81,6 @@ RUN apt-get -qq update \
libedgetpu1-max python3-tflite-runtime python3-pycoral \ libedgetpu1-max python3-tflite-runtime python3-pycoral \
jellyfin-ffmpeg \ jellyfin-ffmpeg \
&& pip3 install -U /wheels/*.whl \ && pip3 install -U /wheels/*.whl \
&& ln -s /usr/lib/jellyfin-ffmpeg/ffmpeg /usr/bin/ffmpeg \
# amd64 specific packages # amd64 specific packages
&& if [ "${TARGETARCH}" = "amd64" ]; then \ && if [ "${TARGETARCH}" = "amd64" ]; then \
apt-get -qq install --no-install-recommends -y \ apt-get -qq install --no-install-recommends -y \
@ -93,6 +92,8 @@ RUN apt-get -qq update \
&& apt-get autoremove -y \ && apt-get autoremove -y \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
ENV PATH=$PATH:/usr/lib/jellyfin-ffmpeg
COPY --from=nginx /usr/local/nginx/ /usr/local/nginx/ COPY --from=nginx /usr/local/nginx/ /usr/local/nginx/
# get model and labels # get model and labels

8
docker/rootfs/usr/local/nginx/conf/nginx.conf
View File

@ -30,17 +30,17 @@ http {
gzip_vary on; gzip_vary on;
upstream frigate_api { upstream frigate_api {
server localhost:5001; server 127.0.0.1:5001;
keepalive 1024; keepalive 1024;
} }
upstream mqtt_ws { upstream mqtt_ws {
server localhost:5002; server 127.0.0.1:5002;
keepalive 1024; keepalive 1024;
} }
upstream jsmpeg { upstream jsmpeg {
server localhost:8082; server 127.0.0.1:8082;
keepalive 1024; keepalive 1024;
} }
@ -175,7 +175,7 @@ http {
location ~* /api/(.*\.(jpg|jpeg|png)$) { location ~* /api/(.*\.(jpg|jpeg|png)$) {
add_header 'Access-Control-Allow-Origin' '*'; add_header 'Access-Control-Allow-Origin' '*';
add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS'; add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS';
proxy_pass http://frigate_api/$1; proxy_pass http://frigate_api/$1$is_args$args;
proxy_pass_request_headers on; proxy_pass_request_headers on;
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;