Skip to content

Commit d7c8043

Browse files
author
Alcides Ramos
committed
feat: minor improvements
1 parent 3171f7f commit d7c8043

File tree

2 files changed

+26
-27
lines changed

2 files changed

+26
-27
lines changed

Makefile

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,20 @@ exit:
9090

9191
.PHONY: welcome
9292
welcome:
93+
$(eval SERVICES=$(shell docker ps --format '{{.Names}}'))
9394
@clear
9495
@gum style --align center --width 80 --padding "1 2" --border double --border-foreground 99 ".: AVAILABLE COMMANDS :."
95-
@echo ":small_blue_diamond: ENVIRONMENT ... $(APP_ENV)" | gum format -t emoji
96-
@echo ":small_blue_diamond: DOMAIN URL .... $(WEBSITE_URL)" | gum format -t emoji
97-
@echo ":small_blue_diamond: SERVICE(S) .... $(shell docker ps --format '{{.Names}}')" | gum format -t emoji
98-
@echo ":small_blue_diamond: USER .......... ($(HOST_USER_ID)) $(HOST_USER_NAME)" | gum format -t emoji
99-
@echo ":small_blue_diamond: GROUP ......... ($(HOST_GROUP_ID)) $(HOST_GROUP_NAME)" | gum format -t emoji
100-
@echo ""
96+
@echo ':small_blue_diamond: ENVIRONMENT ... {{ Color "212" "0" " $(APP_ENV) " }}' | gum format -t emoji | gum format -t template
97+
@echo ''
98+
@echo ':small_blue_diamond: DOMAIN URL .... {{ Color "212" "0" " $(WEBSITE_URL) " }}' | gum format -t emoji | gum format -t template
99+
@echo ''
100+
@echo ':small_blue_diamond: USER .......... {{ Color "212" "0" " ($(HOST_USER_ID)) $(HOST_USER_NAME) " }}' | gum format -t emoji | gum format -t template
101+
@echo ''
102+
@echo ':small_blue_diamond: GROUP ......... {{ Color "212" "0" " ($(HOST_GROUP_ID)) $(HOST_GROUP_NAME) " }}' | gum format -t emoji | gum format -t template
103+
@echo ''
104+
@echo ':small_blue_diamond: SERVICE(S) .... {{ Color "212" "0" " $(SERVICES) " }}' | gum format -t emoji | gum format -t template
105+
@echo ''
106+
@echo ''
101107

102108
###
103109
# HELP
@@ -138,21 +144,18 @@ restart:
138144

139145
.PHONY: logs
140146
logs:
141-
@clear
142147
$(call showInfo,"Exposing service\(s\) logs...")
143148
@$(DOCKER_COMPOSE) logs -f
144149
$(call taskDone)
145150

146151
.PHONY: inspect
147152
inspect: choose-service
148-
@clear
149153
$(call showInfo,"Inspecting [ $(SERVICE) ] health...")
150154
@docker inspect --format "{{json .State.Health}}" $(SERVICE) | jq
151155
$(call taskDone)
152156

153157
.PHONY: shell
154158
shell:
155-
@clear
156159
$(call showInfo,"Establishing a shell terminal with [ $(SERVICE_APP) ] service...")
157160
@$(DOCKER_RUN_AS_USER) sh
158161
$(call taskDone)
@@ -175,35 +178,30 @@ install-caddy-certificate:
175178

176179
.PHONY: composer-dump
177180
composer-dump:
178-
@clear
179181
$(call showInfo,"Executing [ composer dump-auto ] inside [ $(SERVICE_APP) ] container service...")
180182
@$(DOCKER_RUN_AS_USER) composer dump-auto
181183
$(call taskDone)
182184

183185
.PHONY: composer-install
184186
composer-install:
185-
@clear
186187
$(call showInfo,"Executing [ composer install ] inside [ $(SERVICE_APP) ] container service...")
187188
@$(DOCKER_RUN_AS_USER) composer install
188189
$(call taskDone)
189190

190191
.PHONY: composer-update
191192
composer-update:
192-
@clear
193193
$(call showInfo,"Executing [ composer update ] inside [ $(SERVICE_APP) ] container service...")
194194
@$(DOCKER_RUN_AS_USER) composer update
195195
$(call taskDone)
196196

197197
.PHONY: composer-require
198198
composer-require:
199-
@clear
200199
$(call showInfo,"Executing [ composer require ] inside [ $(SERVICE_APP) ] container service...")
201200
@$(DOCKER_RUN_AS_USER) composer require
202201
$(call taskDone)
203202

204203
.PHONY: composer-require-dev
205204
composer-require-dev:
206-
@clear
207205
$(call showInfo,"Executing [ composer require --dev ] inside [ $(SERVICE_APP) ] container service...")
208206
@$(DOCKER_RUN_AS_USER) composer require --dev
209207
$(call taskDone)
@@ -214,42 +212,36 @@ composer-require-dev:
214212

215213
.PHONY: check-syntax
216214
check-syntax:
217-
@clear
218215
$(call showInfo,"Executing [ composer check-syntax ] inside [ $(SERVICE_APP) ] container service...")
219216
@$(DOCKER_RUN_AS_USER) composer check-syntax
220217
$(call taskDone)
221218

222219
.PHONY: check-style
223220
check-style:
224-
@clear
225221
$(call showInfo,"Executing [ composer check-style ] inside [ $(SERVICE_APP) ] container service...")
226222
@$(DOCKER_RUN_AS_USER) composer check-style
227223
$(call taskDone)
228224

229225
.PHONY: fix-style
230226
fix-style:
231-
@clear
232227
$(call showInfo,"Executing [ composer fix-style ] inside [ $(SERVICE_APP) ] container service...")
233228
@$(DOCKER_RUN_AS_USER) composer fix-style
234229
$(call taskDone)
235230

236231
.PHONY: phpstan
237232
phpstan:
238-
@clear
239233
$(call showInfo,"Executing [ composer phpstan ] inside [ $(SERVICE_APP) ] container service...")
240234
@$(DOCKER_RUN_AS_USER) composer phpstan
241235
$(call taskDone)
242236

243237
.PHONY: test
244238
test:
245-
@clear
246239
$(call showInfo,"Executing [ composer paratest ] inside [ $(SERVICE_APP) ] container service...")
247240
@$(DOCKER_RUN_AS_USER) composer paratest
248241
$(call taskDone)
249242

250243
.PHONY: coverage
251244
coverage:
252-
@clear
253245
$(call showInfo,"Executing [ composer paracoverage ] inside [ $(SERVICE_APP) ] container service...")
254246
@$(DOCKER_RUN_AS_USER) composer paracoverage
255247
$(call taskDone)
@@ -260,7 +252,6 @@ coverage:
260252

261253
.PHONY: install-skeleton
262254
install-skeleton:
263-
@clear
264255
$(call showInfo,"Installing [ PHP Skeleton ]...")
265256
@$(DOCKER_RUN_AS_USER) composer create-project alcidesrc/php-skeleton .
266257
$(call taskDone)

src/composer.lock

Lines changed: 14 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)