DRAFT Add Buildall automation

Add additional data to docker-list command
  - tag
  - version
    - use actual version instead of parsed branch information which
      doesn't build properly with tags
  - git tag prefix
  - build target
    - add nickname to avoid building more than is needed

Fix spelling of LENGTH

fix einv-* target in root Makefile

Author: Zack Williams

Makefile

@@ -49,6 +49,7 @@ docker-push: ## push all docker containers
 	for dir in $(DOCKER_PROJECTS); do $(MAKE) -C $$dir $@; done
 
 docker-list: ## list all docker containers
+	@echo "images:"
 	@for dir in $(DOCKER_PROJECTS); do $(MAKE) -C $$dir $@; done
 
 test: ## test in all subprojects
@@ -68,7 +69,7 @@ bit-%: ## Run bulk-import-tools subproject's tasks, e.g. bit-test
 	$(MAKE) -C bulk-import-tools $*
 
 einv-%: ## Run exporters-inventory subproject's tasks, e.g. einv-test
-	$(MAKE) -C exporter-inventory $*
+	$(MAKE) -C exporters-inventory $*
 
 inv-%: ## Run inventory subproject's tasks, e.g. inv-test
 	$(MAKE) -C inventory $*

api/Makefile

@@ -22,6 +22,7 @@ SWAGGERCLI       := true
 
 # Project variables
 PROJECT_NAME     := api
+PROJECT_NICKNAME := api
 BINARY_NAME      := $(PROJECT_NAME)
 
 # Code versions, tags, and so on
@@ -31,6 +32,7 @@ VERSION_MAJOR    := 0
 DOCKER_IMG_NAME  := $(PROJECT_NAME)
 DOCKER_VERSION   ?= $(shell git branch --show-current | sed 's/\//_/g')
 GIT_COMMIT       ?= $(shell git rev-parse HEAD)
+GIT_TAG_PREFIX   := $(PROJECT_NAME)/v
 
 # Test variables
 # Set TEST_TARGET to '<testname1>' or '<testname1\|testname2>' to run specific tests or use other regex '<testname.*>' - example:

bulk-import-tools/Makefile

@@ -19,12 +19,14 @@ PROTOCGENDOC  := true
 
 # Project variables
 PROJECT_NAME	:= bulk-import-tools
+PROJECT_NICKNAME := bit
 BULK_IMPORT_BINARY_NAME	:= orch-host-bulk-import
 PREFLIGHT_BINARY_NAME	:= orch-host-preflight
 
 # Versioning variables
-VERSION       := $(shell cat VERSION)
-GIT_COMMIT    ?= $(shell git rev-parse --short HEAD)
+VERSION          := $(shell cat VERSION)
+GIT_COMMIT       ?= $(shell git rev-parse --short HEAD)
+GIT_TAG_PREFIX   := $(PROJECT_NAME)/v
 
 # Test variables
 # Set TEST_TARGET to '<testname1>' or '<testname1\|testname2>' to run specific tests or use regex '<testname.*>' - example:

common.mk

@@ -34,23 +34,24 @@ DEPS    := go.mod go.sum
 # Docker variables
 DOCKER_ENV              := DOCKER_BUILDKIT=1
 OCI_REGISTRY            ?= 080137407410.dkr.ecr.us-west-2.amazonaws.com
-OCI_REPOSITORY          ?= edge-orch/infra
+OCI_REPOSITORY          ?= edge-orch
+DOCKER_SECTION          := infra
 DOCKER_REGISTRY         ?= $(OCI_REGISTRY)
 DOCKER_REPOSITORY       ?= $(OCI_REPOSITORY)
-DOCKER_TAG              := $(DOCKER_REGISTRY)/$(DOCKER_REPOSITORY)/$(DOCKER_IMG_NAME):$(VERSION)
-DOCKER_TAG_BRANCH	    := $(DOCKER_REGISTRY)/$(DOCKER_REPOSITORY)/$(DOCKER_IMG_NAME):$(DOCKER_VERSION)
+DOCKER_TAG              := $(DOCKER_REGISTRY)/$(DOCKER_REPOSITORY)/$(DOCKER_SECTION)/$(DOCKER_IMG_NAME):$(VERSION)
+DOCKER_TAG_BRANCH       := $(DOCKER_REGISTRY)/$(DOCKER_REPOSITORY)/$(DOCKER_SECTION)/$(DOCKER_IMG_NAME):$(DOCKER_VERSION)
 # Decides if we shall push image tagged with the branch name or not.
 DOCKER_TAG_BRANCH_PUSH	?= true
 LABEL_REPO_URL          ?= $(shell git remote get-url $(shell git remote | head -n 1))
 LABEL_VERSION           ?= $(VERSION)
 LABEL_REVISION          ?= $(GIT_COMMIT)
 LABEL_BUILD_DATE        ?= $(shell date -u "+%Y-%m-%dT%H:%M:%SZ")
 
-DB_CONTAINER_NAME 		:= $(PROJECT_NAME)-db
+DB_CONTAINER_NAME       := $(PROJECT_NAME)-db
 
 YAML_FILES := $(shell find . -type f \( -name '*.yaml' -o -name '*.yml' \) -print )
 YAML_IGNORE ?= vendor, .github/workflows, $(VENV_NAME)
-YAML_LINE_LENGHT ?= 99
+YAML_LINE_LENGTH ?= 99
 
 # Docker networking flags for the database container.
 # The problem is as follows: On a local MacOS machine we want to expose the port
@@ -106,7 +107,7 @@ common-docker-build: ## Build Docker image
 	$(GOCMD) mod vendor
 	cp ../common.mk ../version.mk .
 	docker build . -f Dockerfile \
-		-t $(DOCKER_IMG_NAME):$(DOCKER_VERSION) \
+		-t $(DOCKER_IMG_NAME):$(VERSION) \
 		--build-arg http_proxy="$(http_proxy)" --build-arg HTTP_PROXY="$(HTTP_PROXY)" \
 		--build-arg https_proxy="$(https_proxy)" --build-arg HTTPS_PROXY="$(HTTPS_PROXY)" \
 		--build-arg no_proxy="$(no_proxy)" --build-arg NO_PROXY="$(NO_PROXY)" \
@@ -119,15 +120,19 @@ common-docker-build: ## Build Docker image
 common-docker-push: ## Tag and push Docker image
 	# TODO: remove ecr create
 	aws ecr create-repository --region us-west-2 --repository-name $(DOCKER_REPOSITORY)/$(DOCKER_IMG_NAME) || true
-	docker tag $(DOCKER_IMG_NAME):$(DOCKER_VERSION) $(DOCKER_TAG_BRANCH)
-	docker tag $(DOCKER_IMG_NAME):$(DOCKER_VERSION) $(DOCKER_TAG)
+	docker tag $(DOCKER_IMG_NAME):$(VERSION) $(DOCKER_TAG_BRANCH)
+	docker tag $(DOCKER_IMG_NAME):$(VERSION) $(DOCKER_TAG)
 	docker push $(DOCKER_TAG)
 ifeq ($(DOCKER_TAG_BRANCH_PUSH), true)
 	docker push $(DOCKER_TAG_BRANCH)
 endif
 
 docker-list: ## Print name of docker container image
-	@echo $(DOCKER_TAG)
+	@echo "  $(DOCKER_IMG_NAME):"
+	@echo "    name: '$(DOCKER_TAG)'"
+	@echo "    version: '$(VERSION)'"
+	@echo "    gitTagPrefix: '$(GIT_TAG_PREFIX)'"
+	@echo "    buildTarget: '$(PROJECT_NICKNAME)-docker-build'"
 
 #### Python venv Target ####
 
@@ -169,10 +174,12 @@ checksec: go-build ## Check various security properties that are available for e
 	checksec --output=json --file=$(OUT_DIR)/$(BINARY_NAME)
 	checksec --fortify-file=$(OUT_DIR)/$(BINARY_NAME)
 
+YAML_FILES := $(shell find . -type f \( -name '*.yaml' -o -name '*.yml' \) -print )
+YAML_IGNORE ?= vendor, .github/workflows, $(VENV_NAME)
 yamllint: $(VENV_NAME) ## Lint YAML files
 	. ./$</bin/activate; set -u ;\
   yamllint --version ;\
-  yamllint -d '{extends: default, rules: {line-length: {max: $(YAML_LINE_LENGHT)}}, ignore: [$(YAML_IGNORE)]}' -s $(YAML_FILES)
+  yamllint -d '{extends: default, rules: {line-length: {max: $(YAML_LINE_LENGTH)}}, ignore: [$(YAML_IGNORE)]}' -s $(YAML_FILES)
 
 mdlint: ## Link MD files
 	markdownlint --version ;\

exporters-inventory/Makefile

@@ -18,6 +18,7 @@ GOCOBERTURA      := true
 
 # Project variables
 PROJECT_NAME     := exporter
+PROJECT_NICKNAME := einv
 BINARY_NAME      := $(PROJECT_NAME)
 
 # Code versions, tags, and so on
@@ -26,6 +27,7 @@ VERSION_MAJOR    := $(shell cut -c 1 VERSION)
 DOCKER_IMG_NAME  := $(PROJECT_NAME)
 DOCKER_VERSION   ?= $(shell git branch --show-current | sed 's/\//_/g')
 GIT_COMMIT       ?= $(shell git rev-parse HEAD)
+GIT_TAG_PREFIX   := exporters-inventory/v
 
 # Test variables
 # Set TEST_TARGET to '<testname1>' or '<testname1\|testname2>' to run specific tests or use regex '<testname.*>' - example:

inventory/Makefile

@@ -27,6 +27,7 @@ PROTOCGENGOGRPC    := true
 
 # Project variables
 PROJECT_NAME       := inventory
+PROJECT_NICKNAME   := inv
 BINARY_NAME        := $(PROJECT_NAME)
 
 # Code versions, tags, and so on
@@ -35,6 +36,7 @@ VERSION_MAJOR      := $(shell cut -c 1 VERSION)
 DOCKER_IMG_NAME    := $(PROJECT_NAME)
 DOCKER_VERSION     ?= $(shell git branch --show-current | sed 's/\//_/g')
 GIT_COMMIT         ?= $(shell git rev-parse HEAD)
+GIT_TAG_PREFIX     := $(PROJECT_NAME)/v
 
 # Test variables
 # Set TEST_TARGET to '<testname1>' or '<testname1\|testname2>' to run specific tests or use other  regex '<testname.*>' - example:

tenant-controller/Makefile

@@ -19,15 +19,17 @@ OPA             := true
 PROTOCGENENT    := true
 
 # Project variables
-PROJECT_NAME    := tenant-controller
-BINARY_NAME     := $(PROJECT_NAME)
+PROJECT_NAME     := tenant-controller
+PROJECT_NICKNAME := tc
+BINARY_NAME      := $(PROJECT_NAME)
 
 # Versioning variables
 VERSION         := $(shell cat VERSION)
 VERSION_MAJOR   := $(shell cut -c 1 VERSION)
 DOCKER_IMG_NAME := $(PROJECT_NAME)
 DOCKER_VERSION  ?= $(shell git branch --show-current | sed 's/\//_/g')
 GIT_COMMIT      ?= $(shell git rev-parse HEAD)
+GIT_TAG_PREFIX  := $(PROJECT_NAME)/v
 
 # Test variables
 # Set TEST_TARGET to '<testname1>' or '<testname1\|testname2>' to run specific tests or use regex '<testname.*>' - example:
@@ -66,7 +68,7 @@ buf-lint: common-buf-lint ## Lint and format protobuf files
 #### Development Targets ####
 
 build: go-build ## Build local binaries
-	
+
 lint: $(OUT_DIR) license yamllint hadolint go-lint mdlint ## Run all lint tools
 
 test: $(OUT_DIR) go-test ## Run all unit tests