From 37916c053b348cbb2345dce2de0a3596cdc329a9 Mon Sep 17 00:00:00 2001
From: Felipe Santos <felipecassiors@gmail.com>
Date: Thu, 17 Nov 2022 15:50:09 -0300
Subject: [PATCH] Allow to set IMAGE_OWNER

---
 .github/workflows/ci.yml |  2 ++
 Makefile                 | 13 +++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b289c4126..52144c477 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,3 +28,5 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build image
         run: make push
+        env:
+          IMAGE_OWNER: ${{ github.actor }}
diff --git a/Makefile b/Makefile
index cd3f380cc..557ad9025 100644
--- a/Makefile
+++ b/Makefile
@@ -2,11 +2,12 @@ default_target: local
 
 COMMIT_HASH := $(shell git log -1 --pretty=format:"%h"|tail -1)
 VERSION = 0.12.0
+IMAGE_OWNER ?= blakeblackshear
 CURRENT_UID := $(shell id -u)
 CURRENT_GID := $(shell id -g)
 
 version:
-	echo "VERSION=\"$(VERSION)-$(COMMIT_HASH)\"" > frigate/version.py
+	echo 'VERSION = "$(VERSION)-$(COMMIT_HASH)"' > frigate/version.py
 
 local: version
 	docker buildx build --tag frigate:latest --load .
@@ -15,19 +16,19 @@ build_web:
 	docker buildx build --target web-dist --output web/dist .
 
 amd64:
-	docker buildx build --platform linux/amd64 --tag blakeblackshear/frigate:$(VERSION)-$(COMMIT_HASH) .
+	docker buildx build --platform linux/amd64 --tag $(IMAGE_OWNER)/frigate:$(VERSION)-$(COMMIT_HASH) .
 
 arm64:
-	docker buildx build --platform linux/arm64 --tag blakeblackshear/frigate:$(VERSION)-$(COMMIT_HASH) .
+	docker buildx build --platform linux/arm64 --tag $(IMAGE_OWNER)/frigate:$(VERSION)-$(COMMIT_HASH) .
 
 armv7:
-	docker buildx build --platform linux/arm/v7 --tag blakeblackshear/frigate:$(VERSION)-$(COMMIT_HASH) .
+	docker buildx build --platform linux/arm/v7 --tag $(IMAGE_OWNER)/frigate:$(VERSION)-$(COMMIT_HASH) .
 
 build: version amd64 arm64 armv7
-	docker buildx build --platform linux/arm/v7,linux/arm64/v8,linux/amd64 --tag blakeblackshear/frigate:$(VERSION)-$(COMMIT_HASH) .
+	docker buildx build --platform linux/arm/v7,linux/arm64/v8,linux/amd64 --tag $(IMAGE_OWNER)/frigate:$(VERSION)-$(COMMIT_HASH) .
 
 push: build
-	docker buildx build --push --platform linux/arm/v7,linux/arm64/v8,linux/amd64 --tag ghcr.io/blakeblackshear/frigate:${GITHUB_REF_NAME}-$(COMMIT_HASH) .
+	docker buildx build --push --platform linux/arm/v7,linux/arm64/v8,linux/amd64 --tag ghcr.io/$(IMAGE_OWNER)/frigate:${GITHUB_REF_NAME}-$(COMMIT_HASH) .
 
 run_tests: frigate
 	docker run --rm --entrypoint=python3 frigate:latest -u -m unittest