Fix : Ajout php unit et correction de l'installation du projet (bdd local)
This commit is contained in:
13
makefile
13
makefile
@@ -1,10 +1,10 @@
|
||||
# Permet d'avoir les variables du fichier .env.docker
|
||||
include docker/.env.docker
|
||||
# Permet d'avoir les variables du fichier .env.docker.local
|
||||
include docker/.env.docker.local
|
||||
|
||||
PHP_CONTAINER = php-$(DOCKER_APP_NAME)-apache
|
||||
SYMFONY_CONSOLE = $(EXEC_PHP) php bin/console
|
||||
|
||||
DOCKER_COMPOSE = docker compose --env-file docker/.env.docker # permet à docker d'utiliser les variables du .env.docker
|
||||
DOCKER_COMPOSE = docker compose --env-file docker/.env.docker.local # permet à docker d'utiliser les variables du .env.docker
|
||||
DOCKER = docker
|
||||
|
||||
EXEC_PHP = $(DOCKER) exec -t -u $(APP_USER) $(PHP_CONTAINER)
|
||||
@@ -19,13 +19,16 @@ FILES =
|
||||
# Lance le container
|
||||
start:
|
||||
@echo "**** START CONTAINERS ****"
|
||||
cp -n docker/.env.docker docker/.env.docker.local
|
||||
CURRENT_UID=$(shell id -u) CURRENT_GID=$(shell id -g) $(DOCKER_COMPOSE) up -d
|
||||
|
||||
# Éteint le container
|
||||
stop:
|
||||
$(DOCKER_COMPOSE) stop
|
||||
|
||||
restart: stop start
|
||||
restart:
|
||||
$(DOCKER_COMPOSE) down
|
||||
CURRENT_UID=$(shell id -u) CURRENT_GID=$(shell id -g) $(DOCKER_COMPOSE) up -d
|
||||
|
||||
install: copy-git-hook composer-install cache-clear node-use build-nuxtJS
|
||||
|
||||
@@ -36,7 +39,7 @@ composer-install:
|
||||
$(EXEC_PHP) composer install
|
||||
|
||||
build-nuxtJS:
|
||||
$(EXEC_PHP) cp -n frontend/.env.dist frontend/.env.local
|
||||
# $(EXEC_PHP) cp -n frontend/.env.dist frontend/.env.local
|
||||
$(EXEC_PHP) sh -lc "cd frontend && npm install && npm run build:dist"
|
||||
|
||||
dev-nuxtJS:
|
||||
|
||||
Reference in New Issue
Block a user