build(Makefile): fix compile dev/prod logic
This commit is contained in:
parent
1f0cd1066a
commit
d77f372158
25
Makefile
25
Makefile
@ -149,16 +149,16 @@ well-known/.well-known:
|
||||
|
||||
.PHONY: %-backend
|
||||
%-backend: FRADRIVE_SERVICE=backend
|
||||
%-backend: --image-build --containerized-%-dev-backend;
|
||||
%-backend: --image-build --containerized---%-dev-backend;
|
||||
|
||||
.PHONY: %-prod-backend
|
||||
%-prod-backend: FRADRIVE_SERVICE=backend
|
||||
%-prod-backend: --image-build --containerized-%-prod-backend;
|
||||
%-prod-backend: --image-build --containerized---%-prod-backend;
|
||||
|
||||
.PHONY: --%-dev-backend
|
||||
--%-dev-backend: FRADRIVE_SERVICE=backend
|
||||
--%-dev-backend: stackopts=--flag uniworx:dev
|
||||
--%-dev-backend: --image-build --containerized-%-backend;
|
||||
--%-dev-backend: --image-build --containerized---%-backend;
|
||||
|
||||
.PHONY: --%-prod-backend
|
||||
--%-prod-backend: FRADRIVE_SERVICE=backend
|
||||
@ -226,17 +226,13 @@ serve-database: --containerized-database
|
||||
--containerized-%-frontend: FRADRIVE_SERVICE=frontend
|
||||
#--containerized-%-frontend: --image-build --image-run-%-frontend;
|
||||
--containerized-%-frontend: --image-build
|
||||
if [ "$(IN_CONTAINER)" == "false" ] ; then \
|
||||
$(MAKE) -- --image-run-$*-frontend ; \
|
||||
fi
|
||||
$(MAKE) -- --image-run-$*-frontend
|
||||
|
||||
.PHONY: --containerized-%-backend
|
||||
--containerized-%-backend: FRADRIVE_SERVICE=backend
|
||||
#--containerized-%-backend: --image-build --image-run-%-backend;
|
||||
--containerized-%-backend: --image-build
|
||||
if [ "$(IN_CONTAINER)" == "false" ] ; then \
|
||||
$(MAKE) -- --image-run-$*-backend ; \
|
||||
fi
|
||||
$(MAKE) -- --image-run-$*-backend
|
||||
|
||||
.PHONY: image-rebuild
|
||||
image-rebuild-%:
|
||||
@ -256,11 +252,12 @@ image-rebuild-%:
|
||||
|
||||
.PHONY: --image-run-%
|
||||
--image-run-%:
|
||||
ifeq ($(IN_CONTAINER),true)
|
||||
$(MAKE) -- $*
|
||||
else
|
||||
$(CONTAINER_COMMAND) run -v $(PWD):/mnt/fradrive --env FRADRIVE_MAKE_TARGET=$* fradrive/$(FRADRIVE_SERVICE)
|
||||
endif
|
||||
MOUNT_DIR=/mnt/fradrive; \
|
||||
if [ "$(IN_CONTAINER)" == "true" ] ; then \
|
||||
$(MAKE) -- $* ; \
|
||||
else \
|
||||
$(CONTAINER_COMMAND) run -v $(PWD):$${MOUNT_DIR} --env IN_CONTAINER=true --env FRADRIVE_MAKE_TARGET=$* fradrive/$(FRADRIVE_SERVICE) ; \
|
||||
fi
|
||||
|
||||
##### CONTAINER TARGETS #####
|
||||
#############################
|
||||
|
||||
Reference in New Issue
Block a user