[Elao - App - Docker] Get rid of docker compose project arguments

manala · May 31, 2022 · 2280700 · 2280700
1 parent 115e282
commit 2280700
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 12 deletions.
diff --git a/elao.app.docker/.manala/Makefile.tmpl b/elao.app.docker/.manala/Makefile.tmpl
@@ -9,10 +9,8 @@ _CURRENT_DIR = $(patsubst ./%,%,.$(patsubst $(realpath $(CURDIR)/$(_DIR))%,%,$(C
 # Project #
 ###########
 
-PROJECT_NAME = {{ .Vars.project.name }}
-
 define project_host
-$(PROJECT_NAME).{{ .Vars.project.domain }}$(if $(1),:{{ .Vars.project.ports_prefix }}$(shell printf "%02d" $(1)))
+{{ .Vars.project.name }}.{{ .Vars.project.domain }}$(if $(1),:{{ .Vars.project.ports_prefix }}$(shell printf "%02d" $(1)))
 endef
 
 -include $(_DIR)/.manala/make/text.mk

diff --git a/elao.app.docker/.manala/docker/compose.yaml.tmpl b/elao.app.docker/.manala/docker/compose.yaml.tmpl
@@ -1,3 +1,5 @@
+name: {{ .Vars.project.name }}
+
 services:
 
     {{- if .Vars.system.mysql.version }}

diff --git a/elao.app.docker/.manala/docker/compose/integration.yaml.tmpl b/elao.app.docker/.manala/docker/compose/integration.yaml.tmpl
@@ -1,3 +1,5 @@
+name: app
+
 services:
 
     #######

diff --git a/elao.app.docker/.manala/docker/make.mk b/elao.app.docker/.manala/docker/make.mk
@@ -44,8 +44,6 @@ _DOCKER_COMPOSE_FILE = \
 	$(if $(_MUTAGEN_COMPOSE),$(_DIR)/.manala/docker/compose/mutagen.yaml) \
 	$(if $(_GIT_CONFIG),$(_DIR)/.manala/docker/compose/git.yaml) \
 	$(if $(_GITHUB_CONFIG),$(_DIR)/.manala/docker/compose/github.yaml)
-_DOCKER_COMPOSE_PROJECT_NAME = $(PROJECT_NAME)
-_DOCKER_COMPOSE_PROJECT_DIRECTORY = $(_DIR)/.manala/docker
 _DOCKER_COMPOSE_PROFILE = development
 _DOCKER_COMPOSE_EXEC_SERVICE = app
 _DOCKER_COMPOSE_EXEC_USER = app
@@ -72,9 +70,7 @@ endif
 ifndef DOCKER
 define _docker_compose
 	$(_DOCKER_COMPOSE_ENV) \
-	$(if $(_DOCKER_COMPOSE_PROJECT_NAME),COMPOSE_PROJECT_NAME=$(_DOCKER_COMPOSE_PROJECT_NAME)) \
 	$(_DOCKER_COMPOSE) \
-		$(if $(_DOCKER_COMPOSE_PROJECT_DIRECTORY),--project-directory $(_DOCKER_COMPOSE_PROJECT_DIRECTORY)) \
 		$(if $(_DOCKER_COMPOSE_PROFILE),--profile $(_DOCKER_COMPOSE_PROFILE)) \
 		$(foreach FILE, $(_DOCKER_COMPOSE_FILE), \
 			--file $(FILE) \

diff --git a/elao.app.docker/.manala/github/system/action.yaml b/elao.app.docker/.manala/github/system/action.yaml
@@ -43,7 +43,6 @@ runs:
       run: |
         echo "::group::🐳 Docker pull"
           docker-compose \
-            --project-directory ./.manala/docker \
             --profile integration \
             --file ./.manala/docker/compose.yaml \
             --file ./.manala/docker/compose/integration.yaml \
@@ -82,8 +81,6 @@ runs:
           MANALA_USER_ID=$(id -u) \
           MANALA_GROUP_ID=$(id -g) \
           docker-compose \
-            --project-directory ./.manala/docker \
-            --project-name app \
             --profile integration \
             --file ./.manala/docker/compose.yaml \
             --file ./.manala/docker/compose/integration.yaml \
@@ -103,8 +100,6 @@ runs:
       run: |
         echo "::group::${{ inputs.shell_group }}"
           docker-compose \
-            --project-directory ./.manala/docker \
-            --project-name app \
             --profile integration \
             --file ./.manala/docker/compose.yaml \
             --file ./.manala/docker/compose/integration.yaml \