chore(Makefile): cleanup; separate docker build and run

This commit is contained in:
Sarah Vaupel 2024-08-19 01:01:13 +02:00
parent 8140ebdc6d
commit ce07458cff

View File

@ -1,5 +1,6 @@
# TODO: make dockerized-% usage the default behaviour, i.e. hide undockerized targets
db ?= -cf
dockerized ?= 1
.PHONY: help
help:
@ -11,7 +12,7 @@ all:
.PHONY: clean
clean:
rm -rf node_modules .npm assets/icons well-known .well-known-cache
rm -rf node_modules .npm assets/icons well-known .well-known-cache static/
rm -rf .stack .stack-work .stack-work-build .stack-work-run .stack-work-test .stack-work-doc
rm -rf bin/
@ -23,11 +24,11 @@ dockerized-build: dockerized-frontend-build dockerized-backend-build
.PHONY: dockerized-frontend-%
dockerized-frontend-%: FRADRIVE_DOCKERFILE=frontend
dockerized-frontend-%: --dockerized-frontend-%;
dockerized-frontend-%: --docker-build-frontend-% --docker-run-frontend-%;
.PHONY: dockerized-backend-%
dockerized-backend-%: FRADRIVE_DOCKERFILE=backend
dockerized-backend-%: --dockerized-backend-%;
dockerized-backend-%: dockerized-backend-dependencies --docker-build-backend-% --docker-run-backend-%;
#.PHONY: start
#start: frontend-build
@ -165,6 +166,7 @@ well-known/.well-known:
# start: frontend-build frontend-build-watch yesod-start
# run-s frontend:build --parallel "frontend:build:watch" "yesod:start"
--dockerized-%:
--docker-build-%:
docker build --rm -t $(FRADRIVE_DOCKERFILE) ./docker/$(FRADRIVE_DOCKERFILE)
--docker-run-%:
docker run --rm -it -v .:/fradrive --user `id -u`:`id -g` --env FRADRIVE_MAKE_TARGET=$* $(FRADRIVE_DOCKERFILE)