Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
Jun 15, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 1 addition & 3 deletions elao.app.docker/.manala/Makefile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions elao.app.docker/.manala/docker/compose.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
name: {{ .Vars.project.name }}

services:

{{- if .Vars.system.mysql.version }}
Expand Down
2 changes: 2 additions & 0 deletions elao.app.docker/.manala/docker/compose/integration.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
name: app

services:

#######
Expand Down
4 changes: 0 additions & 4 deletions elao.app.docker/.manala/docker/make.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@ _DOCKER_COMPOSE_FILE = \
$(if $(_GIT_CONFIG),$(_DIR)/.manala/docker/compose/git.yaml) \
$(if $(_GITHUB_CONFIG),$(_DIR)/.manala/docker/compose/github.yaml) \
$(if $(SYMFONY_IDE),$(_DIR)/.manala/docker/compose/symfony.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
Expand All @@ -74,9 +72,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) \
Expand Down
5 changes: 0 additions & 5 deletions elao.app.docker/.manala/github/system/action.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down