rename stacks to separe host and user worlds

2022-05-07 15:04:44 +02:00
parent 15e846e3a4
commit 87a194c446
26 changed files with 97 additions and 75 deletions
@@ -1,6 +1,5 @@
 APP_DIR                         ?= $(CURDIR)
 APP_DOMAIN                      ?= $(ENV)$(addprefix .,$(DOMAIN))
-APP_ENV                         ?= $(USER_ENV)_$(APP)
 APP_HOST                        ?= $(APP)$(addprefix .,$(APP_DOMAIN))
 APP_INSTALLED                   ?= $(APPS)
 APP_PARENT                      ?= $(MONOREPO)
@@ -24,7 +23,7 @@ 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
-SERVICE_ENV                     ?= $(subst _,-,$(APP_ENV))
+PROJECT_ENV                     ?= $(USER)_$(APP)_$(ENV)
 SERVICE_NAME                    ?= $(COMPOSE_SERVICE_NAME)
 SERVICE_VERSION                 ?= $(BUILD_DATE)-$(VERSION)
 SERVICES                        ?= $(DOCKER_SERVICES)