From 749c34be9ffe9309229f2ed75f1097747e308179 Mon Sep 17 00:00:00 2001 From: Blake Blackshear Date: Sat, 16 Jan 2021 20:03:42 -0600 Subject: [PATCH] versioning wheels image --- Makefile | 16 ++++++++-------- docker/Dockerfile.base | 3 ++- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 2eb418217..9dc362170 100644 --- a/Makefile +++ b/Makefile @@ -9,49 +9,49 @@ web: docker build --tag frigate-web --file docker/Dockerfile.web web/ amd64_wheels: - docker build --tag blakeblackshear/frigate-wheels:amd64 --file docker/Dockerfile.wheels . + docker build --tag blakeblackshear/frigate-wheels:1.0.0-amd64 --file docker/Dockerfile.wheels . amd64_ffmpeg: docker build --tag blakeblackshear/frigate-ffmpeg:1.1.0-amd64 --file docker/Dockerfile.ffmpeg.amd64 . amd64_frigate: version web - docker build --tag frigate-base --build-arg ARCH=amd64 --build-arg FFMPEG_VERSION=1.1.0 --file docker/Dockerfile.base . + docker build --tag frigate-base --build-arg ARCH=amd64 --build-arg FFMPEG_VERSION=1.1.0 --build-arg WHEELS_VERSION=1.0.0 --file docker/Dockerfile.base . docker build --tag frigate --file docker/Dockerfile.amd64 . amd64_all: amd64_wheels amd64_ffmpeg amd64_frigate amd64nvidia_wheels: - docker build --tag blakeblackshear/frigate-wheels:amd64nvidia --file docker/Dockerfile.wheels . + docker build --tag blakeblackshear/frigate-wheels:1.0.0-amd64nvidia --file docker/Dockerfile.wheels . amd64nvidia_ffmpeg: docker build --tag blakeblackshear/frigate-ffmpeg:1.0.0-amd64nvidia --file docker/Dockerfile.ffmpeg.amd64nvidia . amd64nvidia_frigate: version web - docker build --tag frigate-base --build-arg ARCH=amd64nvidia --build-arg FFMPEG_VERSION=1.0.0 --file docker/Dockerfile.base . + docker build --tag frigate-base --build-arg ARCH=amd64nvidia --build-arg FFMPEG_VERSION=1.0.0 --build-arg WHEELS_VERSION=1.0.0 --file docker/Dockerfile.base . docker build --tag frigate --file docker/Dockerfile.amd64nvidia . amd64nvidia_all: amd64nvidia_wheels amd64nvidia_ffmpeg amd64nvidia_frigate aarch64_wheels: - docker build --tag blakeblackshear/frigate-wheels:aarch64 --file docker/Dockerfile.wheels.aarch64 . + docker build --tag blakeblackshear/frigate-wheels:1.0.0-aarch64 --file docker/Dockerfile.wheels.aarch64 . aarch64_ffmpeg: docker build --tag blakeblackshear/frigate-ffmpeg:1.0.0-aarch64 --file docker/Dockerfile.ffmpeg.aarch64 . aarch64_frigate: version web - docker build --tag frigate-base --build-arg ARCH=aarch64 --build-arg FFMPEG_VERSION=1.0.0 --file docker/Dockerfile.base . + docker build --tag frigate-base --build-arg ARCH=aarch64 --build-arg FFMPEG_VERSION=1.0.0 --build-arg WHEELS_VERSION=1.0.0 --file docker/Dockerfile.base . docker build --tag frigate --file docker/Dockerfile.aarch64 . armv7_all: armv7_wheels armv7_ffmpeg armv7_frigate armv7_wheels: - docker build --tag blakeblackshear/frigate-wheels:armv7 --file docker/Dockerfile.wheels . + docker build --tag blakeblackshear/frigate-wheels:1.0.0-armv7 --file docker/Dockerfile.wheels . armv7_ffmpeg: docker build --tag blakeblackshear/frigate-ffmpeg:1.0.0-armv7 --file docker/Dockerfile.ffmpeg.armv7 . armv7_frigate: version web - docker build --tag frigate-base --build-arg ARCH=armv7 --build-arg FFMPEG_VERSION=1.0.0 --file docker/Dockerfile.base . + docker build --tag frigate-base --build-arg ARCH=armv7 --build-arg FFMPEG_VERSION=1.0.0 --build-arg WHEELS_VERSION=1.0.0 --file docker/Dockerfile.base . docker build --tag frigate --file docker/Dockerfile.armv7 . armv7_all: armv7_wheels armv7_ffmpeg armv7_frigate diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base index 9c75390a9..1acbe4c46 100644 --- a/docker/Dockerfile.base +++ b/docker/Dockerfile.base @@ -1,6 +1,7 @@ ARG ARCH=amd64 +ARG WHEELS_VERSION ARG FFMPEG_VERSION -FROM blakeblackshear/frigate-wheels:${ARCH} as wheels +FROM blakeblackshear/frigate-wheels:${WHEELS_VERSION}-${ARCH} as wheels FROM blakeblackshear/frigate-ffmpeg:${FFMPEG_VERSION}-${ARCH} as ffmpeg FROM frigate-web as web