Browse Source

makefile: fix incomplete list of phony targets; rename variable for consistency

https://github.com/fphammerle/switchbot-mqtt/commit/870cac5cfc019c3857689dac1372b1cf074a4da5
Fabian Peter Hammerle 8 months ago
parent
commit
e8dfe51bb8
1 changed files with 3 additions and 3 deletions
  1. 3 3
      Makefile

+ 3 - 3
Makefile

@@ -1,5 +1,5 @@
 IMAGE_NAME = docker.io/fphammerle/onion-service
-BUILD_VERSION = $(shell git describe --match=v* --abbrev=0 --dirty | sed -e 's/^v//')
+PROJECT_VERSION = $(shell git describe --match=v* --abbrev=0 --dirty | sed -e 's/^v//')
 TOR_PACKAGE_VERSION = $(shell grep -Po 'TOR_PACKAGE_VERSION=\K.+' Dockerfile | tr -d -)
 ARCH = $(shell arch)
 # architecture[arm_variant]
@@ -9,11 +9,11 @@ IMAGE_TAG_ARCH_armv6l = armv6
 IMAGE_TAG_ARCH_armv7l = armv7
 IMAGE_TAG_ARCH_x86_64 = amd64
 IMAGE_TAG_ARCH = ${IMAGE_TAG_ARCH_${ARCH}}
-IMAGE_TAG = ${BUILD_VERSION}-tor${TOR_PACKAGE_VERSION}-${IMAGE_TAG_ARCH}
+IMAGE_TAG = ${PROJECT_VERSION}-tor${TOR_PACKAGE_VERSION}-${IMAGE_TAG_ARCH}
 BUILD_PARAMS = --tag="${IMAGE_NAME}:${IMAGE_TAG}" \
 	--build-arg=REVISION="$(shell git rev-parse HEAD)"
 
-.PHONY: docker-build podman-build docker-push
+.PHONY: worktree-clean docker-build podman-build docker-push
 
 worktree-clean:
 	git diff --exit-code