make: docker-build-log task creates log file for diagnosis

Docker has a collapsed view of the build output when run on the command line `make docker-build-log` builds the service and creates a time-stamped log file of docker output
practicalli · Apr 28, 2024 · ff78c00 · ff78c00
1 parent a1f5a88
commit ff78c00
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@ All notable changes to this project will be documented in this file. This change
 ## Changed
 - security: update to clojure 1.11.2
 - library: update tools.build to 0.10.0 - caches correctly in docker
+- make: docker-build-log task to create log file of all docker output for diagnosis
 
 # 2024-04-08
 

diff --git a/resources/practicalli/application/root/Makefile b/resources/practicalli/application/root/Makefile
@@ -32,6 +32,8 @@ MEGALINTER_RUNNER = npx mega-linter-runner --flavor java --env "'MEGALINTER_CONF
 CLOJURE_TEST_RUNNER = clojure -M:test/env:test/run
 CLOJURE_EXEC_TEST_RUNNER = clojure -X:test/env:test/run
 
+DOCKER-BUILD-LOGFILE := docker-build-log-$(shell date +%y-%m-%d-%T).org
+
 # Makefile file and directory name wildcard
 # EDN-FILES := $(wildcard *.edn)
 # ------------------------------------ #
@@ -137,6 +139,10 @@ docker-build:  ## Build Clojure project and run with docker compose
 	$(info --------- Docker Compose Build ---------)
 	docker compose up --build --detach
 
+docker-build-log:  ## Build Clojure project and run with docker compose - log to file
+	$(info --------- Docker Compose Build ---------)
+	docker compose up --build --detach &> $(DOCKER-BUILD-LOGFILE) | tee $(DOCKER-BUILD-LOGFILE)
+
 docker-build-clean:  ## Build Clojure project and run with docker compose, removing orphans
 	$(info --------- Docker Compose Build - remove orphans ---------)
 	docker compose up --build --remove-orphans --detach

diff --git a/resources/practicalli/landing_page/root/Makefile b/resources/practicalli/landing_page/root/Makefile
@@ -32,6 +32,8 @@ MEGALINTER_RUNNER = npx mega-linter-runner --flavor java --env "'MEGALINTER_CONF
 CLOJURE_TEST_RUNNER = clojure -M:test/env:test/run
 CLOJURE_EXEC_TEST_RUNNER = clojure -X:test/env:test/run
 
+DOCKER-BUILD-LOGFILE := docker-build-log-$(shell date +%y-%m-%d-%T).org
+
 # Makefile file and directory name wildcard
 # EDN-FILES := $(wildcard *.edn)
 # ------------------------------------ #
@@ -151,6 +153,10 @@ docker-build:  ## Build Clojure project and run with docker compose
 	$(info --------- Docker Compose Build ---------)
 	docker compose up --build --detach
 
+docker-build-log:  ## Build Clojure project and run with docker compose - log to file
+	$(info --------- Docker Compose Build ---------)
+	docker compose up --build --detach &> $(DOCKER-BUILD-LOGFILE) | tee $(DOCKER-BUILD-LOGFILE)
+
 docker-build-clean:  ## Build Clojure project and run with docker compose, removing orphans
 	$(info --------- Docker Compose Build - remove orphans ---------)
 	docker compose up --build --remove-orphans --detach

diff --git a/resources/practicalli/minimal/root/Makefile b/resources/practicalli/minimal/root/Makefile
@@ -32,6 +32,8 @@ MEGALINTER_RUNNER = npx mega-linter-runner --flavor java --env "'MEGALINTER_CONF
 CLOJURE_TEST_RUNNER = clojure -M:test/env:test/run
 CLOJURE_EXEC_TEST_RUNNER = clojure -X:test/env:test/run
 
+DOCKER-BUILD-LOGFILE := docker-build-log-$(shell date +%y-%m-%d-%T).org
+
 # Makefile file and directory name wildcard
 # EDN-FILES := $(wildcard *.edn)
 # ------------------------------------ #
@@ -93,19 +95,19 @@ test-watch-all:  ## Run all tests when changes saved, regardless of failing test
 # -------- Build tasks --------------- #
 build-config: ## Pretty print build configuration
 	$(info --------- View current build config ---------)
-	clojure -T:build config
+	clojure -T:build/task config
 
 build-jar: ## Build a jar archive of Clojure project
 	$(info --------- Build library jar ---------)
-	clojure -T:build jar
+	clojure -T:build/task jar
 
 build-uberjar: ## Build a uberjar archive of Clojure project & Clojure runtime
 	$(info --------- Build service Uberjar  ---------)
-	clojure -T:build uberjar
+	clojure -T:build/task uberjar
 
 build-clean: ## Clean build assets or given directory
 	$(info --------- Clean Build  ---------)
-	clojure -T:build clean
+	clojure -T:build/task clean
 # ------------------------------------ #
 
 # ------- Code Quality --------------- #
@@ -137,6 +139,10 @@ docker-build:  ## Build Clojure project and run with docker compose
 	$(info --------- Docker Compose Build ---------)
 	docker compose up --build --detach
 
+docker-build-log:  ## Build Clojure project and run with docker compose - log to file
+	$(info --------- Docker Compose Build ---------)
+	docker compose up --build --detach &> $(DOCKER-BUILD-LOGFILE) | tee $(DOCKER-BUILD-LOGFILE)
+
 docker-build-clean:  ## Build Clojure project and run with docker compose, removing orphans
 	$(info --------- Docker Compose Build - remove orphans ---------)
 	docker compose up --build --remove-orphans --detach

diff --git a/resources/practicalli/service/root/Makefile b/resources/practicalli/service/root/Makefile
@@ -32,6 +32,8 @@ MEGALINTER_RUNNER = npx mega-linter-runner --flavor java --env "'MEGALINTER_CONF
 CLOJURE_TEST_RUNNER = clojure -M:test/env:test/run
 CLOJURE_EXEC_TEST_RUNNER = clojure -X:test/env:test/run
 
+DOCKER-BUILD-LOGFILE := docker-build-log-$(shell date +%y-%m-%d-%T).org
+
 # Makefile file and directory name wildcard
 # EDN-FILES := $(wildcard *.edn)
 # ------------------------------------ #
@@ -56,7 +58,7 @@ run:  ## Run Service using clojure.main
 
 deps: deps.edn  ## Prepare dependencies for test and dist targets
 	$(info --------- Download test and service libraries ---------)
-	clojure -P -X:build
+	clojure -P -M:test/run && clojure -P -T:build/task
 
 dist: build-uberjar ## Build and package Clojure service
 	$(info --------- Build and Package Clojure service ---------)
@@ -97,19 +99,19 @@ test-watch-all:  ## Run all tests when changes saved, regardless of failing test
 # -------- Build tasks --------------- #
 build-config: ## Pretty print build configuration
 	$(info --------- View current build config ---------)
-	clojure -T:build config
+	clojure -T:build/task config
 
 build-jar: ## Build a jar archive of Clojure project
 	$(info --------- Build library jar ---------)
-	clojure -T:build jar
+	clojure -T:build/task jar
 
 build-uberjar: ## Build a uberjar archive of Clojure project & Clojure runtime
 	$(info --------- Build service Uberjar  ---------)
-	clojure -T:build uberjar
+	clojure -T:build/task uberjar
 
 build-clean: ## Clean build assets or given directory
 	$(info --------- Clean Build  ---------)
-	clojure -T:build clean
+	clojure -T:build/task clean
 # ------------------------------------ #
 
 # ------- Code Quality --------------- #
@@ -141,6 +143,10 @@ docker-build:  ## Build Clojure project and run with docker compose
 	$(info --------- Docker Compose Build ---------)
 	docker compose up --build --detach
 
+docker-build-log:  ## Build Clojure project and run with docker compose - log to file
+	$(info --------- Docker Compose Build ---------)
+	docker compose up --build --detach &> $(DOCKER-BUILD-LOGFILE) | tee $(DOCKER-BUILD-LOGFILE)
+
 docker-build-clean:  ## Build Clojure project and run with docker compose, removing orphans
 	$(info --------- Docker Compose Build - remove orphans ---------)
 	docker compose up --build --remove-orphans --detach