Skip to content

Commit 9cad175

Browse files
committed
makefile minor
1 parent 90c2357 commit 9cad175

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

Makefile

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -684,9 +684,9 @@ info-registry: ## info on local registry (if any)
684684

685685
## INFO -------------------------------
686686

687-
.PHONY: info info-images info-swarm info-tools
687+
.PHONY: info info-images info-swarm
688688
info: ## displays setup information
689-
# setup info:
689+
@echo setup info --------------------------------
690690
@echo ' Detected OS : $(IS_LINUX)$(IS_OSX)$(IS_WSL)$(IS_WSL2)$(IS_WIN)'
691691
@echo ' SWARM_STACK_NAME : ${SWARM_STACK_NAME}'
692692
@echo ' DOCKER_REGISTRY : $(DOCKER_REGISTRY)'
@@ -696,7 +696,12 @@ info: ## displays setup information
696696
@echo ' - ULR : ${VCS_URL}'
697697
@echo ' - REF : ${VCS_REF}'
698698
@echo ' - (STATUS)REF_CLIENT : (${VCS_STATUS_CLIENT}) ${VCS_REF_CLIENT}'
699-
# dev tools version
699+
@make --silent info-tools
700+
701+
702+
.PHONY: show-tools
703+
info-tools: ## displays tools versions
704+
@echo dev-tools versions -------------------------
700705
@echo ' awk : $(shell awk -W version 2>&1 | head -n 1)'
701706
@echo ' docker : $(shell docker --version)'
702707
@echo ' docker buildx : $(shell docker buildx version)'
@@ -709,6 +714,7 @@ info: ## displays setup information
709714
@echo ' ubuntu : $(shell lsb_release --description --short 2> /dev/null | tail || echo ERROR Not an Ubuntu OS )'
710715

711716

717+
712718
define show-meta
713719
$(foreach iid,$(shell docker images */$(1):* -q | sort | uniq),\
714720
docker image inspect $(iid) | jq '.[0] | .RepoTags, .Config.Labels, .Architecture';)

scripts/common.Makefile

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,8 @@ clean: ## cleans all unversioned files in project and temp files create by this
9898
@git clean $(_GIT_CLEAN_ARGS)
9999

100100

101+
102+
101103
.PHONY: info
102104
inf%: ## displays basic info
103105
# system
@@ -106,12 +108,6 @@ inf%: ## displays basic info
106108
@echo ' NOW_TIMESTAMP : ${NOW_TIMESTAMP}'
107109
@echo ' VCS_URL : ${VCS_URL}'
108110
@echo ' VCS_REF : ${VCS_REF}'
109-
# dev tools version
110-
@echo ' make : $(shell make --version 2>&1 | head -n 1)'
111-
@echo ' jq : $(shell jq --version)'
112-
@echo ' awk : $(shell awk -W version 2>&1 | head -n 1)'
113-
@echo ' node : $(shell node --version 2> /dev/null || echo ERROR nodejs missing)'
114-
@echo ' python : $(shell python3 --version)'
115111
# installed in .venv
116112
@uv pip list
117113
# package setup

0 commit comments

Comments
 (0)