diff --git a/Makefile b/Makefile index 4773dfc59..0cc046778 100644 --- a/Makefile +++ b/Makefile @@ -41,7 +41,7 @@ export UNIWORXDB_OPTS ?= -cf export PROD ?= false ifneq ($(PROD),true) - export --DEVELOPMENT=--flag=uniworx:dev + export --DEVELOPMENT=--flag uniworx:dev endif export DATE := $(shell date +'%Y-%m-%dT%H-%M-%S') @@ -192,9 +192,9 @@ lint-%: --act ; echo "$(PORTS)" | sed 's/ /\n/g' > $${CONTAINER_FILE} ; \ $(MAKE) -- --$* CONTAINER_FILE=$${CONTAINER_FILE} CONTAINER_IDENT=$${CONTAINER_IDENT} -.PHONY: image-rebuild_% -# HELP(image-rebuild_{backend,frontend,database,memcached,minio}): force-rebuild the stated docker image -image-rebuild_%: +.PHONY: rebuild-% +# HELP(rebuild-{backend,frontend,database,memcached,minio}): force-rebuild the stated docker image +rebuild-%: $(MAKE) -- --image-build SERVICE=$* NO_CACHE=--no-cache --image-build: ifeq "$(CONTAINER_CMD)" "localhost/fradrive/$(SERVICE)" @@ -237,10 +237,23 @@ endif fi # HELP(start-backend): start yesod-devel instance ---start-backend: - DEV_PORT_HTTP=`cat $(CONTAINER_FILE) | grep 'DEV_PORT_HTTP=' | sed 's/DEV_PORT_HTTP=//'`; \ - DEV_PORT_HTTPS=`cat $(CONTAINER_FILE) | grep 'DEV_PORT_HTTPS=' | sed 's/DEV_PORT_HTTPS=//'`; \ - stack $(STACK_CORES) exec -- yesod devel -p "$${DEV_PORT_HTTP}" -q "$${DEV_PORT_HTTPS}" +--start-backend: --compile-backend + export DEV_PORT_HTTP=`cat $(CONTAINER_FILE) | grep 'DEV_PORT_HTTP=' | sed 's/DEV_PORT_HTTP=//'`; \ + export DEV_PORT_HTTPS=`cat $(CONTAINER_FILE) | grep 'DEV_PORT_HTTPS=' | sed 's/DEV_PORT_HTTPS=//'`; \ + export HOST=`hostname -s` ; \ + export DETAILED_LOGGING=$${DETAILED_LOGGING:-true} ; \ + export LOG_ALL=$${LOG_ALL:-false} ; \ + export LOGLEVEL=$${LOGLEVEL:-info} ; \ + export DUMMY_LOGIN=$${DUMMY_LOGIN:-true} ; \ + export SERVER_SESSION_ACID_FALLBACK=$${SERVER_SESSION_ACID_FALLBACK:-true} ; \ + export SERVER_SESSION_COOKIES_SECURE=$${SERVER_SESSION_COOKIES_SECURE:-false} ; \ + export COOKIES_SECURE=$${COOKIES_SECURE:-false} ; \ + export ALLOW_DEPRECATED=$${ALLOW_DEPRECATED:-true} ; \ + export ENCRYPT_ERRORS=$${ENCRYPT_ERRORS:-false} ; \ + export RIBBON=$${RIBBON:-$${HOST:-localhost}} ; \ + export APPROOT=$${APPROOT:-http://localhost:$${DEV_PORT_HTTP}} ; \ + export AVSPASS=$${AVSPASS:-nopasswordset} ; \ + stack $(STACK_CORES) exec --local-bin-path $$(pwd)/bin -- yesod devel -p "$${DEV_PORT_HTTP}" -q "$${DEV_PORT_HTTPS}" # HELP(compile-backend): compile backend binaries --compile-backend: stack build $(STACK_CORES) --fast --profile --library-profiling --executable-profiling --flag uniworx:-library-only $(--DEVELOPMENT) --local-bin-path $$(pwd)/bin