only make .env if dir exists
This commit is contained in:
@@ -39,7 +39,7 @@ endef
|
|||||||
all: $(ENV_RULES) $(MAKE_RULES) $(BUILD_RULES) $(PUSH_RULES)
|
all: $(ENV_RULES) $(MAKE_RULES) $(BUILD_RULES) $(PUSH_RULES)
|
||||||
|
|
||||||
$(foreach module,$(ALL_MODULES),$(eval $(call make_module_rule)))
|
$(foreach module,$(ALL_MODULES),$(eval $(call make_module_rule)))
|
||||||
$(foreach module,$(ALL_MODULES),$(eval $(call module_env_rule)))
|
$(foreach module,$(ALL_MODULES),$(if $(shell test -d $(module) && echo 1),$(eval $(call module_env_rule))))
|
||||||
|
|
||||||
.PHONY: install
|
.PHONY: install
|
||||||
install: install_nginx $(ENV_RULES) $(INSTALL_RULES) install_crontab
|
install: install_nginx $(ENV_RULES) $(INSTALL_RULES) install_crontab
|
||||||
|
|||||||
+1
-1
@@ -54,7 +54,7 @@ $(foreach hostname,$(HOSTNAMES),$(foreach module,$(MODULES_$(hostname)),$(eval \
|
|||||||
SUBDOMAINS := $(foreach module,$(MODULES),$(SUBDOMAIN_$(module)))
|
SUBDOMAINS := $(foreach module,$(MODULES),$(SUBDOMAIN_$(module)))
|
||||||
NGINX_SUBDOMAINS := $(foreach module,$(NGINX_MODULES),$(SUBDOMAIN_$(module)))
|
NGINX_SUBDOMAINS := $(foreach module,$(NGINX_MODULES),$(SUBDOMAIN_$(module)))
|
||||||
|
|
||||||
ENV_RULES := $(foreach module,$(MODULES),$(module)/.env)
|
ENV_RULES := $(foreach module,$(MODULES),$(if $(shell test -d $(module) && echo 1),$(module)/.env))
|
||||||
MAKE_RULES := $(foreach module,$(MAKE_MODULES),make_$(module))
|
MAKE_RULES := $(foreach module,$(MAKE_MODULES),make_$(module))
|
||||||
BUILD_RULES := $(foreach module,$(filter $(COMPOSE_SERVICES),$(MODULES)),build_$(module))
|
BUILD_RULES := $(foreach module,$(filter $(COMPOSE_SERVICES),$(MODULES)),build_$(module))
|
||||||
PUSH_RULES := $(foreach module,$(filter $(COMPOSE_SERVICES),$(MODULES)),push_$(module))
|
PUSH_RULES := $(foreach module,$(filter $(COMPOSE_SERVICES),$(MODULES)),push_$(module))
|
||||||
|
|||||||
Reference in New Issue
Block a user