From a3cb02af5c12552fcf8b9d3abec0fa679007e58c Mon Sep 17 00:00:00 2001 From: Blake Blackshear Date: Sun, 18 Oct 2020 10:42:01 -0500 Subject: [PATCH] sync arch names with hassio --- Makefile | 32 +++++++++---------- .../{Dockerfile.arm64 => Dockerfile.aarch64} | 0 .../{Dockerfile.armv7hf => Dockerfile.armv7} | 0 ...ffmpeg.arm64 => Dockerfile.ffmpeg.aarch64} | 0 ...ffmpeg.armv7hf => Dockerfile.ffmpeg.armv7} | 0 ...wheels.arm64 => Dockerfile.wheels.aarch64} | 0 6 files changed, 16 insertions(+), 16 deletions(-) rename docker/{Dockerfile.arm64 => Dockerfile.aarch64} (100%) rename docker/{Dockerfile.armv7hf => Dockerfile.armv7} (100%) rename docker/{Dockerfile.ffmpeg.arm64 => Dockerfile.ffmpeg.aarch64} (100%) rename docker/{Dockerfile.ffmpeg.armv7hf => Dockerfile.ffmpeg.armv7} (100%) rename docker/{Dockerfile.wheels.arm64 => Dockerfile.wheels.aarch64} (100%) diff --git a/Makefile b/Makefile index e72fcd182..e23dd6653 100644 --- a/Makefile +++ b/Makefile @@ -12,26 +12,26 @@ amd64_frigate: amd64_all: amd64_wheels amd64_ffmpeg amd64_frigate -arm64_wheels: - docker build --tag blakeblackshear/frigate-wheels:arm64 --file docker/Dockerfile.wheels.arm64 . +aarch64_wheels: + docker build --tag blakeblackshear/frigate-wheels:aarch64 --file docker/Dockerfile.wheels.aarch64 . -arm64_ffmpeg: - docker build --tag blakeblackshear/frigate-ffmpeg:arm64 --file docker/Dockerfile.ffmpeg.arm64 . +aarch64_ffmpeg: + docker build --tag blakeblackshear/frigate-ffmpeg:aarch64 --file docker/Dockerfile.ffmpeg.aarch64 . -arm64_frigate: - docker build --tag frigate-base --build-arg ARCH=arm64 --file docker/Dockerfile.base . - docker build --tag frigate --file docker/Dockerfile.arm64 . +aarch64_frigate: + docker build --tag frigate-base --build-arg ARCH=aarch64 --file docker/Dockerfile.base . + docker build --tag frigate --file docker/Dockerfile.aarch64 . -armv7hf_all: arm64_wheels arm64_ffmpeg arm64_frigate +armv7_all: armv7_wheels armv7_ffmpeg armv7_frigate -armv7hf_wheels: - docker build --tag blakeblackshear/frigate-wheels:armv7hf --file docker/Dockerfile.wheels . +armv7_wheels: + docker build --tag blakeblackshear/frigate-wheels:armv7 --file docker/Dockerfile.wheels . -armv7hf_ffmpeg: - docker build --tag blakeblackshear/frigate-ffmpeg:armv7hf --file docker/Dockerfile.ffmpeg.armv7hf . +armv7_ffmpeg: + docker build --tag blakeblackshear/frigate-ffmpeg:armv7 --file docker/Dockerfile.ffmpeg.armv7 . -armv7hf_frigate: - docker build --tag frigate-base --build-arg ARCH=armv7hf --file docker/Dockerfile.base . - docker build --tag frigate --file docker/Dockerfile.armv7hf . +armv7_frigate: + docker build --tag frigate-base --build-arg ARCH=armv7 --file docker/Dockerfile.base . + docker build --tag frigate --file docker/Dockerfile.armv7 . -armv7hf_all: armv7hf_wheels armv7hf_ffmpeg armv7hf_frigate +armv7_all: armv7_wheels armv7_ffmpeg armv7_frigate diff --git a/docker/Dockerfile.arm64 b/docker/Dockerfile.aarch64 similarity index 100% rename from docker/Dockerfile.arm64 rename to docker/Dockerfile.aarch64 diff --git a/docker/Dockerfile.armv7hf b/docker/Dockerfile.armv7 similarity index 100% rename from docker/Dockerfile.armv7hf rename to docker/Dockerfile.armv7 diff --git a/docker/Dockerfile.ffmpeg.arm64 b/docker/Dockerfile.ffmpeg.aarch64 similarity index 100% rename from docker/Dockerfile.ffmpeg.arm64 rename to docker/Dockerfile.ffmpeg.aarch64 diff --git a/docker/Dockerfile.ffmpeg.armv7hf b/docker/Dockerfile.ffmpeg.armv7 similarity index 100% rename from docker/Dockerfile.ffmpeg.armv7hf rename to docker/Dockerfile.ffmpeg.armv7 diff --git a/docker/Dockerfile.wheels.arm64 b/docker/Dockerfile.wheels.aarch64 similarity index 100% rename from docker/Dockerfile.wheels.arm64 rename to docker/Dockerfile.wheels.aarch64