clean up health

makefiles/Shipkit-main.make

@@ -57,11 +57,14 @@ help: | _program_awk
 	# word list gets all the makefiles that were included
 	# if target_regex is set then help.awk will pick it up and filter targets based on that.
 	awk -v target_regex=$(HELP_REGEX) -f $(HELP_AWK) $(wordlist 2,$(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)) $(_HELP_F)
-	printf "\n$(culine)Common Variables Options:\n$(creset)"
-	printf "$(ccyanB) VERBOSE=true                 $(creset)| show logit.debug in build/make/shikit.log and shows target output on console \n"
-	printf "$(ccyanB) dry_run=true                 $(creset)| setting this to true will stop certain deployment commands from pushing, such as kubectl and docker \n"
-	printf "$(ccyanB) env=<file.env> or <file.sh>  $(creset)| loads custom variables in from .env file or source 'imports' a custom bash .sh script \n"
-	printf "\n"
+	if [[ ! "$${HELP_REGEX:-}" ]]; then
+		printf "\n$(culine)Common Variables Options:\n$(creset)"
+		printf "$(ccyanB) help.* or *.help             $(creset)| most target prefixes can list help with either git.help or help.git for ex\n"
+		printf "$(ccyanB) VERBOSE=true                 $(creset)| show logit.debug in build/make/shikit.log and shows target output on console \n"
+		printf "$(ccyanB) dry_run=true                 $(creset)| setting this to true will stop certain deployment commands from pushing, such as kubectl and docker \n"
+		printf "$(ccyanB) env=<file.env> or <file.sh>  $(creset)| loads custom variables in from .env file or source 'imports' a custom bash .sh script \n"
+		printf "\n"
+	fi
 .PHONY: help
 
 ## list all the availible Make targets, including the targets hidden from core help

makefiles/docker-db.make

@@ -6,7 +6,13 @@ docker_tools := $(SHIPKIT_BIN)/docker_tools
 
 #----- DB targets -------
 
-## starts the DOCK_DB_BUILD_NAME db if its not started yet
+## Database, list help for db.* targets
+help.db:
+	$(MAKE) help HELP_REGEX="^db.*"
+
+db.help: help.db
+
+# starts the DOCK_DB_BUILD_NAME db if its not started yet
 db.start: db.create-network
 	# ACCEPT_EULA is for sql server, just an env var so won't matter that its set for others
 	$(docker_tools) start "$(DOCK_DB_BUILD_NAME)" -d \
@@ -18,7 +24,7 @@ db.start: db.create-network
 		-e "$(PASS_VAR_NAME)"="$(DB_PASSWORD)" \
 		"$(DB_DOCKER_URL)"
 
-## alias for db.start
+# alias for db.start
 start.db: db.start
 
 db.create-network:
@@ -29,14 +35,14 @@ db.wait:
 	# TODO not working
 	$(DockerDbExec) $(build.sh) wait_for_$(DBMS) $(DB_HOST) $(DB_PASSWORD)
 
-## stop and remove the docker DOCK_DB_BUILD_NAME
+# stop and remove the docker DOCK_DB_BUILD_NAME
 db.down:
 	$(docker_tools) remove $(DOCK_DB_BUILD_NAME)
 
 ## restart the db
 db.restart: db.down
 	$(MAKE) $(DBMS) "db.start"
 
-## stop and remove the docker DOCK_DB_BUILD_NAME
+# stop and remove the docker DOCK_DB_BUILD_NAME
 db.pull: db.down ## pulls latest nine-db from dock9 docker hub
 	docker pull $(DB_DOCKER_URL)

makefiles/git-dev.make

@@ -2,10 +2,10 @@
 # helpers for git dev
 # -------------
 
-## show help for GIT and GITHUB short cut helpers, alias to help.git
+## Git or g.* help
 g.help: help.git
 
-## show help for GIT and GITHUB short cut helpers
+## Git or g.* help
 help.git:
 	$(MAKE) help HELP_REGEX="^g[\.]+.*"
 

makefiles/gradle-tools.make

@@ -60,7 +60,7 @@ start.jar: $(APP_JAR)
 
 .PHONY: resolve-dependencies merge-test-results
 
-## show help list for gradle targets
+## Gradle - show help list for gradle targets
 help.gradle:
 	$(MAKE) help HELP_REGEX="^gradle.*"
 

makefiles/ship-k8s-pages.make

@@ -4,7 +4,7 @@ PAGES_DEPLOY_TPL ?= $(SHIPKIT_DIR)/k8s/docmark-pages-deploy.tpl.yml
 pages.delete-k8s-deployment:
 	$(kube_tools) ctl  delete deployment,ingress --selector="pages=$(PAGES_APP_KEY)" --namespace="$(PAGES_KUBE_NAMESPACE)"
 
-## apply docmark-pages-deploy.tpl kubectl to deploy site to k8s
+# apply docmark-pages-deploy.tpl kubectl to deploy site to k8s
 pages.deploy-k8s: pages.delete-k8s-deployment
 	${kube_tools} apply_tpl $(PAGES_DEPLOY_TPL)
 

version.properties

@@ -8,4 +8,4 @@ publishedVersion=2.0.10
 # when this is false will append -SNAPSHOT to version and if on publishable branch will 'publish' to snapshotUrl
 # when true IS_RELEASEBALE will be set and will go through full release process cycle to
 # automatically bump version and push a v tag to github
-release=false
+release=true