wip

make/apps/build.mk

@@ -13,7 +13,7 @@ build@%: myos-base
 	$(eval DRYRUN_IGNORE   := false)
 	$(eval docker_images   += $(foreach service,$(SERVICES),$(if $(shell docker images -q $(DOCKER_REPOSITORY)/$(service):$(DOCKER_IMAGE_TAG) 2>/dev/null),$(service))))
 	$(eval build_app       := $(or $(filter $(DOCKER_BUILD_CACHE),false),$(filter-out $(docker_images),$(SERVICES))))
-	$(if $(build_app),$(call make,app-build),$(if $(filter $(VERBOSE),true),$(foreach service,$(SERVICES),echo "docker image $(DOCKER_REPOSITORY)/$(service):$(DOCKER_IMAGE_TAG) has id $(shell docker images -q $(DOCKER_REPOSITORY)/$(service):$(DOCKER_IMAGE_TAG) 2>/dev/null)" &&) true))
+	$(if $(build_app),$(call make,build-init app-build),$(if $(filter $(VERBOSE),true),$(foreach service,$(SERVICES),echo "docker image $(DOCKER_REPOSITORY)/$(service):$(DOCKER_IMAGE_TAG) has id $(shell docker images -q $(DOCKER_REPOSITORY)/$(service):$(DOCKER_IMAGE_TAG) 2>/dev/null)" &&) true))
 
 # target build-env: Build .env file in docker $(SERVICE) to deploy
 .PHONY: build-env
@@ -21,10 +21,10 @@ build-env: SERVICE ?= $(DOCKER_SERVICE)
 build-env: bootstrap
 	$(call docker-compose-exec,$(SERVICE),rm -f .env && make .env ENV=$(ENV) && echo BUILD=true >> .env && echo BUILD_DATE='"\'"'$(shell date "+%d/%m/%Y %H:%M:%S %z" 2>/dev/null)'"\'"' >> .env && echo BUILD_STATUS='"\'"'$(shell git status -uno --porcelain 2>/dev/null)'"\'"' >> .env && echo DOCKER=false >> .env && $(foreach var,$(BUILD_APP_VARS),$(if $($(var)),sed -i '/^$(var)=/d' .env && echo $(var)='$($(var))' >> .env &&)) true)
 
-# target build-rm: Empty build directory
-.PHONY: build-rm
-build-rm:
-	$(call exec,rm -rf build && mkdir -p build)
+# target build-init: Empty build directory
+.PHONY: build-init
+build-init:
+	$(ECHO) rm -rf build && $(ECHO) mkdir -p build
 
 # target build-$(SHARED): Create shared folder in docker $(SERVICE) to deploy
 .PHONY: build-$(SHARED)