refactor makefile: rename variables (including removal of "DOCKER_" p…

…refixes)

fphammerle/systemctl-mqtt@c8d77c1
fphammerle/docker-onion-service@4c673ee
fphammerle/docker-onion-service@a3e8952
fphammerle/docker-onion-service@571aa8c

Makefile

@@ -16,26 +16,28 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-DOCKER_IMAGE_NAME := docker.io/fphammerle/switchbot-mqtt
-DOCKER_TAG_VERSION := $(shell git describe --match=v* --dirty | sed -e 's/^v//')
-ARCH := $(shell arch)
-DOCKER_TAG_ARCH_SUFFIX_aarch64 := arm64
-DOCKER_TAG_ARCH_SUFFIX_armv6l := armv6
-DOCKER_TAG_ARCH_SUFFIX_armv7l := armv7
-DOCKER_TAG_ARCH_SUFFIX_x86_64 := amd64
-DOCKER_TAG_ARCH_SUFFIX = ${DOCKER_TAG_ARCH_SUFFIX_${ARCH}}
-DOCKER_TAG = ${DOCKER_TAG_VERSION}-${DOCKER_TAG_ARCH_SUFFIX}
+IMAGE_NAME = docker.io/fphammerle/switchbot-mqtt
+PROJECT_VERSION = $(shell git describe --match=v* --dirty | sed -e 's/^v//')
+ARCH = $(shell arch)
+# architecture[arm_variant]
+# https://github.com/opencontainers/image-spec/blob/v1.0.1/image-index.md#image-index-property-descriptions
+IMAGE_TAG_ARCH_aarch64 = arm64
+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 = ${PROJECT_VERSION}-${IMAGE_TAG_ARCH}
 
 .PHONY: docker-build podman-build docker-push
 
 docker-build:
-	sudo docker build --tag="${DOCKER_IMAGE_NAME}:${DOCKER_TAG}" .
+	sudo docker build --tag="${IMAGE_NAME}:${IMAGE_TAG}" .
 
 podman-build:
 	# --format=oci (default) not fully supported by hub.docker.com
 	# https://github.com/docker/hub-feedback/issues/1871#issuecomment-748924149
-	podman build --format=docker --tag="${DOCKER_IMAGE_NAME}:${DOCKER_TAG}" .
+	podman build --format=docker --tag="${IMAGE_NAME}:${IMAGE_TAG}" .
 
 docker-push: docker-build
-	sudo docker push "${DOCKER_IMAGE_NAME}:${DOCKER_TAG}"
-	@echo git tag --sign --message '$(shell sudo docker image inspect --format '{{join .RepoDigests "\n"}}' "${DOCKER_IMAGE_NAME}:${DOCKER_TAG}")' docker/${DOCKER_TAG} $(shell git rev-parse HEAD)
+	sudo docker push "${IMAGE_NAME}:${IMAGE_TAG}"
+	@echo git tag --sign --message '$(shell sudo docker image inspect --format '{{join .RepoDigests "\n"}}' "${IMAGE_NAME}:${IMAGE_TAG}")' docker/${IMAGE_TAG} $(shell git rev-parse HEAD)