wip

make/apps/build.mk

@@ -26,11 +26,11 @@ build-env: bootstrap
 build-init:
 	$(ECHO) rm -rf build && $(ECHO) mkdir -p build
 
-# target build-$(SHARED): Create shared folder in docker $(SERVICE) to deploy
-.PHONY: build-$(SHARED)
-build-$(SHARED): SERVICE ?= $(DOCKER_SERVICE)
-build-$(SHARED): bootstrap
-	$(call docker-compose-exec,$(SERVICE),mkdir -p /$(SHARED) && $(foreach folder,$(SHARED_FOLDERS),rm -rf $(folder) && mkdir -p $(dir $(folder)) && ln -s /$(SHARED)/$(notdir $(folder)) $(folder) &&) true)
+# target build-shared: Create shared folder in docker $(SERVICE) to deploy
+.PHONY: build-shared
+build-shared: SERVICE ?= $(DOCKER_SERVICE)
+build-shared: bootstrap
+	$(call docker-compose-exec,$(SERVICE),mkdir -p /$(notdir $(SHARED)) && $(foreach folder,$(SHARED_FOLDERS),rm -rf $(folder) && mkdir -p $(dir $(folder)) && ln -s /$(notdir $(SHARED))/$(notdir $(folder)) $(folder) &&) true)
 
 # target rebuild: Rebuild application docker images on local host
 .PHONY: rebuild

make/apps/def.docker.mk

@@ -142,7 +142,7 @@ define docker-stack-update
 	$(eval version         := $(or $(2),$(if $(findstring :,$(stack)),$(lastword $(subst :, ,$(stack))),latest)))
 	$(eval path            := $(patsubst %/,%,$(or $(3),$(if $(findstring /,$(1)),$(if $(wildcard stack/$(1) stack/$(1).yml),stack/$(if $(findstring .yml,$(1)),$(dir $(1)),$(if $(wildcard stack/$(1).yml),$(dir $(1)),$(1))),$(dir $(1)))),stack/$(name))))
 	$(eval COMPOSE_FILE    += $(wildcard $(path)/$(name).yml $(path)/$(name).$(ENV).yml $(path)/$(name).$(ENV).$(version).yml $(path)/$(name).$(version).yml))
-	$(if $(wildcard $(path)/.env.dist),$(call .env,,$(path)/.env.dist,$(wildcard ../$(PARAMETERS)/$(ENV)/$(APP)/.env $(path)/.env.$(ENV) .env)))
+	$(if $(wildcard $(path)/.env.dist),$(call .env,,$(path)/.env.dist,$(wildcard $(PARAMETERS)/$(ENV)/$(APP)/.env $(path)/.env.$(ENV) .env)))
 endef
 define docker-tag
 	$(eval service         := $(or $(1),$(DOCKER_SERVICE)))

make/apps/def.install.mk

@@ -3,5 +3,5 @@ define install-parameters
         $(eval file:=$(or $(2),$(DOCKER_SERVICE)/parameters.yml))
         $(eval dest:=$(or $(3),app/config))
         $(eval env:=$(or $(4),$(ENV)))
-        $(if $(wildcard $(dest)/$(file)),,$(if $(wildcard ../$(PARAMETERS)/$(env)/$(path)/$(file)),$(ECHO) cp -a ../$(PARAMETERS)/$(env)/$(path)/$(file) $(dest)))
+        $(if $(wildcard $(dest)/$(file)),,$(if $(wildcard $(PARAMETERS)/$(env)/$(path)/$(file)),$(ECHO) cp -a $(PARAMETERS)/$(env)/$(path)/$(file) $(dest)))
 endef

make/apps/def.mk

@@ -15,4 +15,3 @@ ENV_VARS                        += APP_DIR APP_DOMAIN APP_HOST APP_PATH APP_URL
 MOUNT_NFS                       ?= false
 NFS_CONFIG                      ?= addr=$(NFS_HOST),actimeo=3,intr,noacl,noatime,nocto,nodiratime,nolock,soft,rsize=32768,wsize=32768,tcp,rw,vers=3
 NFS_HOST                        ?= host.docker.internal
-PARAMETERS                      ?= ../parameters

make/apps/myos/def.mk

@@ -2,7 +2,7 @@ CMDS                            += ssh-run
 COMPOSE_IGNORE_ORPHANS          := true
 ENV_VARS                        += COMPOSE_IGNORE_ORPHANS DOCKER_IMAGE_CLI DOCKER_IMAGE_SSH DOCKER_NAME_CLI DOCKER_NAME_SSH
 HOME                            ?= /home/$(USER)
-NFS_DISK                        ?= $(NFS_HOST):/$(SHARED)
+NFS_DISK                        ?= $(NFS_HOST):/$(notdir $(SHARED))
 NFS_OPTIONS                     ?= rw,rsize=8192,wsize=8192,bg,hard,intr,nfsvers=3,noatime,nodiratime,actimeo=3
 NFS_PATH                        ?= /srv/$(subst :,,$(NFS_DISK))
 SHELL                           ?= /bin/sh