From 693f5a46a9e1015a06c681b380c18ee69774c033 Mon Sep 17 00:00:00 2001 From: Eduardo Silva Date: Fri, 5 Sep 2025 23:43:46 +0100 Subject: [PATCH] A bit of Makefile improvements --- src/Makefile | 7 ++++--- src/TODO.md | 2 +- src/pgImage/Makefile | 7 ++++--- src/vars.mk | 3 +++ 4 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 src/vars.mk diff --git a/src/Makefile b/src/Makefile index f4c03f1..c324a75 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,7 +1,5 @@ +include vars.mk build = ./build/expensesweb -registry = dir.esilva.org -repo = esilva -tag = v0.0.81-alpha build_release_alpine: rm -rf build && mkdir -p $(build) @@ -32,3 +30,6 @@ test: go test -coverprofile=coverage.out ./... go tool cover -html=coverage.out -o coverage.html rm ./coverage.out + +build_db_image: + make -C ./pgImage build diff --git a/src/TODO.md b/src/TODO.md index 288f32b..a59a86f 100644 --- a/src/TODO.md +++ b/src/TODO.md @@ -1,8 +1,8 @@ # DOING -Migrating to postgres Refactor how the models access the database (move the Tx creation to the models) Refactor the Makefiles Refactor the App start function +Add NIF columns to stores and to users # TODO - [ ] On the categories page, add a column of how many times a given category is diff --git a/src/pgImage/Makefile b/src/pgImage/Makefile index 901a558..7114e27 100644 --- a/src/pgImage/Makefile +++ b/src/pgImage/Makefile @@ -1,7 +1,5 @@ +include ../vars.mk service = expenses-pgdb -registry = dir.esilva.org -repo = esilva -tag = v0.0.81-alpha image = $(service) container = $(image)-container @@ -34,3 +32,6 @@ test: remove-dev-container --env-file .env \ -v ./pgsql-data-dev/:/var/lib/postgresql/data/ \ -it $(image) + +build_image: + make -C ./ diff --git a/src/vars.mk b/src/vars.mk new file mode 100644 index 0000000..8cb90ee --- /dev/null +++ b/src/vars.mk @@ -0,0 +1,3 @@ +registry = dir.esilva.org +repo = esilva +tag = v0.0.81-alpha