Adjust verbosity and overwrite vars

Author: cytopia

Makefile.docker

@@ -2,6 +2,10 @@ ifneq (,)
 .error This Makefile requires GNU Make.
 endif
 
+ifndef VERBOSE
+MAKEFLAGS += --no-print-directory
+endif
+
 
 # -------------------------------------------------------------------------------------------------
 # Docker required Variables
@@ -13,12 +17,12 @@ IMAGE   =
 # -------------------------------------------------------------------------------------------------
 # Docker optional Variables
 # -------------------------------------------------------------------------------------------------
-NO_CACHE =
-ARGS     =
-ARCH     = linux/amd64
-TAG      = latest
-DIR      = .
-FILE     = Dockerfile
+NO_CACHE   =
+ARGS       =
+ARCH       = linux/amd64
+DOCKER_TAG = latest
+DIR        = .
+FILE       = Dockerfile
 
 
 # -------------------------------------------------------------------------------------------------
@@ -30,7 +34,7 @@ docker-help:
 	@echo "    NAME=                   # (req) Set label name"
 	@echo "    VERSION=                # (req) Set label version"
 	@echo "    IMAGE=                  # (req) Set Docker image name"
-	@echo "    TAG=                    # (opt) Set Docker image tag"
+	@echo "    DOCKER_TAG=             # (opt) Set Docker image tag"
 	@echo "    ARCH=                   # (opt) Specify Docker platform to build against"
 	@echo "    DIR=                    # (opt) Specify directory of Docker file"
 	@echo "    FILE=                   # (opt) Specify filename of Docker file"
@@ -61,7 +65,7 @@ docker-arch-build:
 		false; \
 	fi
 	@echo "################################################################################"
-	@echo "# Building $(IMAGE):$(TAG) (platform: $(ARCH))"
+	@echo "# Building $(IMAGE):$(DOCKER_TAG) (platform: $(ARCH))"
 	@echo "################################################################################"
 	docker build \
 		$(NO_CACHE) \
@@ -71,7 +75,7 @@ docker-arch-build:
 		--label "org.opencontainers.image.revision"="$$(git rev-parse HEAD)" \
 		--label "org.opencontainers.image.name"="$(NAME)" \
 		--label "org.opencontainers.image.version"="$(VERSION)" \
-		--tag $(IMAGE):$(TAG) \
+		--tag $(IMAGE):$(DOCKER_TAG) \
 		--file $(DIR)/$(FILE) $(DIR)
 
 
@@ -83,44 +87,62 @@ docker-arch-rebuild: docker-arch-build
 
 .PHONY: docker-arch-push
 docker-arch-push:
+	@if [ "$(IMAGE)" = "" ]; then \
+		echo "This make target requires the IMAGE variable to be set."; \
+		echo "make docker-arch-push IMAGE="; \
+		echo "Exiting."; \
+		false; \
+	fi
 	@echo "################################################################################"
-	@echo "# Pushing Docker Image $(IMAGE):$(TAG)-manifest-$(subst /,-,$(ARCH))"
+	@echo "# Pushing Docker Image $(IMAGE):$(DOCKER_TAG)-manifest-$(subst /,-,$(ARCH))"
 	@echo "################################################################################"
-	docker tag $(IMAGE):$(TAG) $(IMAGE):$(TAG)-manifest-$(subst /,-,$(ARCH))
-	docker push $(IMAGE):$(TAG)-manifest-$(subst /,-,$(ARCH))
+	docker tag $(IMAGE):$(DOCKER_TAG) $(IMAGE):$(DOCKER_TAG)-manifest-$(subst /,-,$(ARCH))
+	docker push $(IMAGE):$(DOCKER_TAG)-manifest-$(subst /,-,$(ARCH))
 
 
 # -------------------------------------------------------------------------------------------------
 # Docker Manifest Targets
 # -------------------------------------------------------------------------------------------------
 .PHONY: docker-manifest-create
 docker-manifest-create:
+	@if [ "$(IMAGE)" = "" ]; then \
+		echo "This make target requires the IMAGE variable to be set."; \
+		echo "make docker-manifest-create IMAGE="; \
+		echo "Exiting."; \
+		false; \
+	fi
 	@if [ "$(ARCHES)" = "" ]; then \
 		echo "This make target requires the ARCHES variable to be set."; \
 		echo "make docker-manifest-create ARCHES="; \
 		echo "Exiting."; \
 		false; \
 	fi
 	@echo "################################################################################"
-	@echo "# Creating Manifest $(IMAGE):$(TAG) ($(ARCHES))"
+	@echo "# Creating Manifest $(IMAGE):$(DOCKER_TAG) ($(ARCHES))"
 	@echo "################################################################################"
 	@echo "docker manifest create \
-		$(IMAGE):$(TAG) \
-		$$( echo $(ARCHES) | sed 's/,/ /g' | sed 's|/|-|g' | xargs -n1 sh -c 'printf -- " --amend $(IMAGE):$(TAG)-manifest-$${1}"' -- )" \
+		$(IMAGE):$(DOCKER_TAG) \
+		$$( echo $(ARCHES) | sed 's/,/ /g' | sed 's|/|-|g' | xargs -n1 sh -c 'printf -- " --amend $(IMAGE):$(DOCKER_TAG)-manifest-$${1}"' -- )" \
 	| sed 's/\s\s*/ /g' \
 	| sed 's/--/\\\n  --/g'
 	@echo "docker manifest create \
-		$(IMAGE):$(TAG) \
-		$$( echo $(ARCHES) | sed 's/,/ /g' | sed 's|/|-|g' | xargs -n1 sh -c 'printf -- " --amend $(IMAGE):$(TAG)-manifest-$${1}"' -- )" \
+		$(IMAGE):$(DOCKER_TAG) \
+		$$( echo $(ARCHES) | sed 's/,/ /g' | sed 's|/|-|g' | xargs -n1 sh -c 'printf -- " --amend $(IMAGE):$(DOCKER_TAG)-manifest-$${1}"' -- )" \
 	| bash
 
 
 .PHONY: docker-manifest-push
 docker-manifest-push:
+	@if [ "$(IMAGE)" = "" ]; then \
+		echo "This make target requires the IMAGE variable to be set."; \
+		echo "make docker-manifest-push IMAGE="; \
+		echo "Exiting."; \
+		false; \
+	fi
 	@echo "################################################################################"
-	@echo "# Pushing Manifest $(IMAGE):$(TAG)"
+	@echo "# Pushing Manifest $(IMAGE):$(DOCKER_TAG)"
 	@echo "################################################################################"
-	docker manifest push $(IMAGE):$(TAG)
+	docker manifest push $(IMAGE):$(DOCKER_TAG)
 
 
 # -------------------------------------------------------------------------------------------------
@@ -136,6 +158,12 @@ docker-pull-base-image:
 
 .PHONY: docker-enter
 docker-enter:
+	@if [ "$(IMAGE)" = "" ]; then \
+		echo "This make target requires the IMAGE variable to be set."; \
+		echo "make docker-enter IMAGE="; \
+		echo "Exiting."; \
+		false; \
+	fi
 	docker run --rm --platform=$(ARCH) -it --entrypoint=bash $(ARG) $(IMAGE)
 
 

Makefile.lint

@@ -2,6 +2,10 @@ ifneq (,)
 .error This Makefile requires GNU Make.
 endif
 
+ifndef VERBOSE
+MAKEFLAGS += --no-print-directory
+endif
+
 
 # -------------------------------------------------------------------------------------------------
 # Default configuration