diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..d829d01
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/php.xml b/.idea/php.xml
index ece8616..a873179 100644
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -4,12 +4,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -164,6 +176,11 @@
+
+
+
+
+
@@ -172,6 +189,11 @@
+
+
+
+
+
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0c0069b..cf43bd3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,13 +5,12 @@
+
+
+
-
-
-
-
-
+
@@ -55,7 +54,7 @@
-
+
@@ -217,34 +216,36 @@
- {
- "keyToString": {
- "RunOnceActivity.MCP Project settings loaded": "true",
- "RunOnceActivity.ShowReadmeOnStart": "true",
- "RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true",
- "RunOnceActivity.git.unshallow": "true",
- "RunOnceActivity.typescript.service.memoryLimit.init": "true",
- "git-widget-placeholder": "develop",
- "node.js.detected.package.eslint": "true",
- "node.js.detected.package.tslint": "true",
- "node.js.selected.package.eslint": "(autodetect)",
- "node.js.selected.package.tslint": "(autodetect)",
- "nodejs_package_manager_path": "npm",
- "settings.editor.selected.configurable": "preferences.pluginManager",
- "vue.rearranger.settings.migration": "true"
+
+}]]>
@@ -257,6 +258,7 @@
+
@@ -282,6 +284,11 @@
+
+
+
+
+
diff --git a/docker/.env.docker b/docker/.env.docker
index 093370a..4a49900 100644
--- a/docker/.env.docker
+++ b/docker/.env.docker
@@ -7,3 +7,5 @@ POSTGRES_USER=root
POSTGRES_PASSWORD=root
POSTGRES_PORT=5432
XDEBUG_CLIENT_HOST=host.docker.internal
+CURRENT_UID=1004
+CURRENT_GID=1004
diff --git a/makefile b/makefile
index 92c2dc5..d7c5413 100644
--- a/makefile
+++ b/makefile
@@ -7,6 +7,9 @@ ENV_FILE := $(if $(wildcard $(ENV_LOCAL)),$(ENV_LOCAL),$(ENV_DEFAULT))
include $(ENV_DEFAULT)
-include $(ENV_LOCAL)
+HOST_UID := $(if $(SUDO_UID),$(SUDO_UID),$(shell id -u))
+HOST_GID := $(if $(SUDO_GID),$(SUDO_GID),$(shell id -g))
+
PHP_CONTAINER = php-$(DOCKER_APP_NAME)-fpm
SYMFONY_CONSOLE = $(EXEC_PHP) php bin/console
@@ -24,13 +27,13 @@ FILES =
env-init:
@mkdir -p docker
- @cp --update=none $(ENV_DEFAULT) $(ENV_LOCAL)
+ @cp -n $(ENV_DEFAULT) $(ENV_LOCAL)
# Lance le container
start: env-init
@echo "**** START CONTAINERS ****"
- @cp --update=none docker/.env.docker docker/.env.docker.local
- CURRENT_UID=$(shell id -u) CURRENT_GID=$(shell id -g) $(DOCKER_COMPOSE) up -d
+ @cp -n docker/.env.docker docker/.env.docker.local
+ CURRENT_UID=$(HOST_UID) CURRENT_GID=$(HOST_GID) $(DOCKER_COMPOSE) up -d
# Éteint le container
stop:
@@ -38,7 +41,7 @@ stop:
restart: env-init
$(DOCKER_COMPOSE) down
- CURRENT_UID=$(shell id -u) CURRENT_GID=$(shell id -g) $(DOCKER_COMPOSE) up -d
+ CURRENT_UID=$(HOST_UID) CURRENT_GID=$(HOST_GID) $(DOCKER_COMPOSE) up -d
install: copy-git-hook composer-install cache-clear node-use build-nuxtJS migration-migrate
@@ -57,9 +60,8 @@ dev-nuxt:
$(EXEC_PHP) sh -c "cd frontend && npm run dev"
delete_built_dir:
- CURRENT_UID=$(shell id -u) CURRENT_GID=$(shell id -g) $(DOCKER_COMPOSE) up -d
- $(DOCKER) exec -u root $(PHP_CONTAINER) rm -rf vendor/
- $(DOCKER) exec -u root $(PHP_CONTAINER) rm -rf frontend/node_modules
+ rm -rf vendor/
+ rm -rf frontend/node_modules
remove_orphans:
$(DOCKER_COMPOSE) kill
@@ -69,8 +71,8 @@ build-without-cache:
$(DOCKER_COMPOSE) build \
--build-arg="DOCKER_PHP_VERSION=$(DOCKER_PHP_VERSION)" \
--build-arg="DOCKER_NODE_VERSION=$(DOCKER_NODE_VERSION)" \
- --build-arg="CURRENT_UID=$(shell id -u)" \
- --build-arg="CURRENT_GID=$(shell id -g)" \
+ --build-arg="CURRENT_UID=$(HOST_UID)" \
+ --build-arg="CURRENT_GID=$(HOST_GID)" \
--no-cache
migration-migrate: