Mirrors/blakeblackshear.frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2024-11-21 19:07:46 +01:00
Code Issues Projects Releases Wiki Activity

add qsv support to amd64 image

Browse Source
This commit is contained in:
Blake Blackshear 2020-12-19 10:50:53 -06:00
parent 32fb76b3d1
commit 151f9fb2ee
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -9,10 +9,10 @@ amd64_wheels:
docker build --tag blakeblackshear/frigate-wheels:amd64 --file docker/Dockerfile.wheels . docker build --tag blakeblackshear/frigate-wheels:amd64 --file docker/Dockerfile.wheels .
amd64_ffmpeg: amd64_ffmpeg:
docker build --tag blakeblackshear/frigate-ffmpeg:1.0.0-amd64 --file docker/Dockerfile.ffmpeg.amd64 . docker build --tag blakeblackshear/frigate-ffmpeg:1.1.0-amd64 --file docker/Dockerfile.ffmpeg.amd64 .
amd64_frigate: version amd64_frigate: version
docker build --tag frigate-base --build-arg ARCH=amd64 --file docker/Dockerfile.base . docker build --tag frigate-base --build-arg ARCH=amd64 --build-arg FFMPEG_VERSION=1.1.0 --file docker/Dockerfile.base .
docker build --tag frigate --file docker/Dockerfile.amd64 . docker build --tag frigate --file docker/Dockerfile.amd64 .
amd64_all: amd64_wheels amd64_ffmpeg amd64_frigate amd64_all: amd64_wheels amd64_ffmpeg amd64_frigate
@ -24,7 +24,7 @@ amd64nvidia_ffmpeg:
docker build --tag blakeblackshear/frigate-ffmpeg:1.0.0-amd64nvidia --file docker/Dockerfile.ffmpeg.amd64nvidia . docker build --tag blakeblackshear/frigate-ffmpeg:1.0.0-amd64nvidia --file docker/Dockerfile.ffmpeg.amd64nvidia .
amd64nvidia_frigate: version amd64nvidia_frigate: version
docker build --tag frigate-base --build-arg ARCH=amd64nvidia --file docker/Dockerfile.base . docker build --tag frigate-base --build-arg ARCH=amd64nvidia --build-arg FFMPEG_VERSION=1.0.0 --file docker/Dockerfile.base .
docker build --tag frigate --file docker/Dockerfile.amd64nvidia . docker build --tag frigate --file docker/Dockerfile.amd64nvidia .
amd64nvidia_all: amd64nvidia_wheels amd64nvidia_ffmpeg amd64nvidia_frigate amd64nvidia_all: amd64nvidia_wheels amd64nvidia_ffmpeg amd64nvidia_frigate
@ -36,7 +36,7 @@ aarch64_ffmpeg:
docker build --tag blakeblackshear/frigate-ffmpeg:1.0.0-aarch64 --file docker/Dockerfile.ffmpeg.aarch64 . docker build --tag blakeblackshear/frigate-ffmpeg:1.0.0-aarch64 --file docker/Dockerfile.ffmpeg.aarch64 .
aarch64_frigate: version aarch64_frigate: version
docker build --tag frigate-base --build-arg ARCH=aarch64 --file docker/Dockerfile.base . docker build --tag frigate-base --build-arg ARCH=aarch64 --build-arg FFMPEG_VERSION=1.0.0 --file docker/Dockerfile.base .
docker build --tag frigate --file docker/Dockerfile.aarch64 . docker build --tag frigate --file docker/Dockerfile.aarch64 .
armv7_all: armv7_wheels armv7_ffmpeg armv7_frigate armv7_all: armv7_wheels armv7_ffmpeg armv7_frigate
@ -48,7 +48,7 @@ armv7_ffmpeg:
docker build --tag blakeblackshear/frigate-ffmpeg:1.0.0-armv7 --file docker/Dockerfile.ffmpeg.armv7 . docker build --tag blakeblackshear/frigate-ffmpeg:1.0.0-armv7 --file docker/Dockerfile.ffmpeg.armv7 .
armv7_frigate: version armv7_frigate: version
docker build --tag frigate-base --build-arg ARCH=armv7 --file docker/Dockerfile.base . docker build --tag frigate-base --build-arg ARCH=armv7 --build-arg FFMPEG_VERSION=1.0.0 --file docker/Dockerfile.base .
docker build --tag frigate --file docker/Dockerfile.armv7 . docker build --tag frigate --file docker/Dockerfile.armv7 .
armv7_all: armv7_wheels armv7_ffmpeg armv7_frigate armv7_all: armv7_wheels armv7_ffmpeg armv7_frigate

2
docker/Dockerfile.amd64
View File

@ -9,7 +9,7 @@ RUN apt-get -qq update \
# ffmpeg dependencies # ffmpeg dependencies
libgomp1 \ libgomp1 \
# VAAPI drivers for Intel hardware accel # VAAPI drivers for Intel hardware accel
libva-drm2 libva2 i965-va-driver vainfo intel-media-va-driver mesa-va-drivers \ libva-drm2 libva2 libmfx1 i965-va-driver vainfo intel-media-va-driver mesa-va-drivers \
## Tensorflow lite ## Tensorflow lite
&& wget -q https://github.com/google-coral/pycoral/releases/download/release-frogfish/tflite_runtime-2.5.0-cp38-cp38-linux_x86_64.whl \ && wget -q https://github.com/google-coral/pycoral/releases/download/release-frogfish/tflite_runtime-2.5.0-cp38-cp38-linux_x86_64.whl \
&& python3.8 -m pip install tflite_runtime-2.5.0-cp38-cp38-linux_x86_64.whl \ && python3.8 -m pip install tflite_runtime-2.5.0-cp38-cp38-linux_x86_64.whl \

3
docker/Dockerfile.base
View File

@ -1,6 +1,7 @@
ARG ARCH=amd64 ARG ARCH=amd64
ARG FFMPEG_VERSION
FROM blakeblackshear/frigate-wheels:${ARCH} as wheels FROM blakeblackshear/frigate-wheels:${ARCH} as wheels
FROM blakeblackshear/frigate-ffmpeg:1.0.0-${ARCH} as ffmpeg FROM blakeblackshear/frigate-ffmpeg:${FFMPEG_VERSION}-${ARCH} as ffmpeg
FROM ubuntu:20.04 FROM ubuntu:20.04
LABEL maintainer "blakeb@blakeshome.com" LABEL maintainer "blakeb@blakeshome.com"

2
docker/Dockerfile.ffmpeg.amd64
View File

@ -79,6 +79,7 @@ RUN buildDeps="autoconf \
libssl-dev \ libssl-dev \
yasm \ yasm \
libva-dev \ libva-dev \
libmfx-dev \
zlib1g-dev" && \ zlib1g-dev" && \
apt-get -yqq update && \ apt-get -yqq update && \
apt-get install -yq --no-install-recommends ${buildDeps} apt-get install -yq --no-install-recommends ${buildDeps}
@ -404,6 +405,7 @@ RUN \
--enable-gpl \ --enable-gpl \
--enable-libfreetype \ --enable-libfreetype \
--enable-libvidstab \ --enable-libvidstab \
--enable-libmfx \
--enable-libmp3lame \ --enable-libmp3lame \
--enable-libopus \ --enable-libopus \
--enable-libtheora \ --enable-libtheora \