held/qrcode
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: use .env for DB config in Makefile

Browse Source
This commit is contained in:
Michael
2026-04-29 22:38:07 +02:00
parent aef835fffa
commit d396cad6f3
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
.dev/.mk/migratioin.mk
View File

@ -1,14 +1,15 @@
migrate-up: ## Migrate seo db to the most recent version available DB_DSN=host=$(DB_HOST) port=$(DB_PORT) user=$(DB_USER) password=$(DB_PASSWORD) dbname=$(DB_NAME) sslmode=disable
docker compose exec qrcode-app sh -c 'goose -dir ./migrations postgres "host=qrcode-postgres port=5432 user=admin password=admin dbname=qrcode sslmode=disable" up' migrate-up: ## Migrate db to latest version
docker compose exec qrcode-app sh -c 'goose -dir ./migrations postgres "$(DB_DSN)" up'
migrate-down: migrate-down:
docker compose exec qrcode-app sh -c 'goose -dir ./migrations postgres "host=qrcode-postgres port=5432 user=admin password=admin dbname=qrcode sslmode=disable" down' docker compose exec qrcode-app sh -c 'goose -dir ./migrations postgres "$(DB_DSN)" down'
migrate-reset: migrate-reset:
docker compose exec qrcode-app sh -c 'goose -dir ./migrations postgres "host=qrcode-postgres port=5432 user=admin password=admin dbname=qrcode sslmode=disable" reset' docker compose exec qrcode-app sh -c 'goose -dir ./migrations postgres "$(DB_DSN)" reset'
migrate-status: migrate-status:
docker compose exec qrcode-app sh -c 'goose -dir ./migrations postgres "host=qrcode-postgres port=5432 user=admin password=admin dbname=qrcode sslmode=disable" status' docker compose exec qrcode-app sh -c 'goose -dir ./migrations postgres "$(DB_DSN)" status'
migrate-create: migrate-create:
docker compose exec qrcode-app sh -c 'goose -dir ./migrations create ${ARGS} sql' docker compose exec qrcode-app sh -c 'goose -dir ./migrations create ${ARGS} sql'

12
.dev/.mk/system.mk
View File

@ -7,19 +7,19 @@ build-no-cache: ## build project
docker compose build --no-cache docker compose build --no-cache
install: ## install the project install: ## install the project
docker compose up -d $(MAKE) up
echo "waiting db up..." echo "waiting db up..."
sleep 5 sleep 5
echo "migrate db" echo "migrate db"
docker compose exec qrcode-app sh -c 'goose -dir ./migrations postgres "host=qrcode-postgres port=5432 user=admin password=admin dbname=qrcode sslmode=disable" up' $(MAKE) migrate-up
echo "install go requarements" echo "install go requarements"
docker compose exec qrcode-app sh -c "go mod tidy" $(MAKE) app-tidy
docker compose exec qrcode-app sh -c "go mod vendor" $(MAKE) app-vendor
echo "install nodejs requarements" echo "install nodejs requarements"
docker compose run qrcode-front sh -c 'npm install' docker compose run qrcode-front sh -c 'npm install'
docker compose stop $(MAKE) stop
echo "start the project" echo "start the project"
docker compose up --remove-orphans $(MAKE) watch
up: ## start project up: ## start project
docker compose up -d --remove-orphans docker compose up -d --remove-orphans

3
Makefile
View File

@ -2,6 +2,9 @@ SHELL := /bin/bash
MAKEFLAGS += --silent MAKEFLAGS += --silent
ARGS = $(filter-out $@,$(MAKECMDGOALS)) ARGS = $(filter-out $@,$(MAKECMDGOALS))
include ./app/.env
export
.default: help .default: help
export UID=$(shell id -u) export UID=$(shell id -u)