From e33cd442cd734eadd656b1e147949776f37578d1 Mon Sep 17 00:00:00 2001 From: Blake Blackshear Date: Tue, 26 Apr 2022 07:17:47 -0500 Subject: [PATCH 1/2] ensure params get passed to api for jpg --- docker/rootfs/usr/local/nginx/conf/nginx.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/rootfs/usr/local/nginx/conf/nginx.conf b/docker/rootfs/usr/local/nginx/conf/nginx.conf index 406af0526..c2ccc5079 100644 --- a/docker/rootfs/usr/local/nginx/conf/nginx.conf +++ b/docker/rootfs/usr/local/nginx/conf/nginx.conf @@ -30,17 +30,17 @@ http { gzip_vary on; upstream frigate_api { - server localhost:5001; + server 127.0.0.1:5001; keepalive 1024; } upstream mqtt_ws { - server localhost:5002; + server 127.0.0.1:5002; keepalive 1024; } upstream jsmpeg { - server localhost:8082; + server 127.0.0.1:8082; keepalive 1024; } @@ -175,7 +175,7 @@ http { location ~* /api/(.*\.(jpg|jpeg|png)$) { add_header 'Access-Control-Allow-Origin' '*'; 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_set_header Host $host; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; From b75929a846453fbcb85526ebca511bcbdada3d3f Mon Sep 17 00:00:00 2001 From: Blake Blackshear Date: Tue, 26 Apr 2022 07:18:13 -0500 Subject: [PATCH 2/2] add all jellyfin-ffmpeg binaries to path --- docker/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 67c35dc96..1e8de13a2 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -81,7 +81,6 @@ RUN apt-get -qq update \ libedgetpu1-max python3-tflite-runtime python3-pycoral \ jellyfin-ffmpeg \ && pip3 install -U /wheels/*.whl \ - && ln -s /usr/lib/jellyfin-ffmpeg/ffmpeg /usr/bin/ffmpeg \ # amd64 specific packages && if [ "${TARGETARCH}" = "amd64" ]; then \ apt-get -qq install --no-install-recommends -y \ @@ -93,6 +92,8 @@ RUN apt-get -qq update \ && apt-get autoremove -y \ && rm -rf /var/lib/apt/lists/* +ENV PATH=$PATH:/usr/lib/jellyfin-ffmpeg + COPY --from=nginx /usr/local/nginx/ /usr/local/nginx/ # get model and labels