Merge remote-tracking branch 'origin/145-build-system-rewrite' into fradrive/merge-jost-new-build
This commit is contained in:
commit
f731d80342
4
Makefile
4
Makefile
@ -96,7 +96,7 @@ start:
|
|||||||
$(MAKE) start-postgres
|
$(MAKE) start-postgres
|
||||||
$(MAKE) start-memcached
|
$(MAKE) start-memcached
|
||||||
$(MAKE) start-minio
|
$(MAKE) start-minio
|
||||||
$(MAKE) start-frontend
|
$(MAKE) compile-frontend
|
||||||
$(MAKE) start-backend
|
$(MAKE) start-backend
|
||||||
|
|
||||||
.PHONY: %-backend
|
.PHONY: %-backend
|
||||||
@ -254,7 +254,7 @@ endif
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# HELP(start-backend): start development instance
|
# HELP(start-backend): start development instance
|
||||||
--start-backend:
|
--start-backend: --compile-backend
|
||||||
export DEV_PORT_HTTP=`cat $(CONTAINER_FILE) | grep 'DEV_PORT_HTTP=' | sed 's/DEV_PORT_HTTP=//'`; \
|
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 DEV_PORT_HTTPS=`cat $(CONTAINER_FILE) | grep 'DEV_PORT_HTTPS=' | sed 's/DEV_PORT_HTTPS=//'`; \
|
||||||
export HOST=`hostname -s` ; \
|
export HOST=`hostname -s` ; \
|
||||||
|
|||||||
Reference in New Issue
Block a user