From 9f05336b400ad58d49f62b939d674e1815510e21 Mon Sep 17 00:00:00 2001 From: guvra Date: Mon, 8 Jan 2024 17:23:58 +0100 Subject: [PATCH] Fix db commands in Makefile --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 93c0f177..43b9821a 100644 --- a/Makefile +++ b/Makefile @@ -59,13 +59,13 @@ test: vendor ## Run phpunit. .PHONY: db db: service := --wait db db: up ## Connect to the database. - $(DOCKER_COMPOSE) exec db sh -c 'mysql --user=$$MYSQL_USER --password=$$MYSQL_PASSWORD' + $(DOCKER_COMPOSE) exec db sh -c 'mysql --password=$$MYSQL_ROOT_PASSWORD' .PHONY: db-import db-import: service := --wait db db-import: up ## Execute a SQL file. Pass the parameter "filename=" to set the filename (default: dump.sql). $(eval filename ?= dump.sql) - $(DOCKER_COMPOSE) exec -T db sh -c 'mysql --user=$$MYSQL_USER --password=$$MYSQL_PASSWORD' < $(filename) + $(DOCKER_COMPOSE) exec -T db sh -c 'mysql --password=$$MYSQL_ROOT_PASSWORD' < $(filename) vendor: composer.json $(PHP_CLI) composer install