From d99670ef856e87b786508c84d4b13c21bd7c5e9f Mon Sep 17 00:00:00 2001
From: Marwolf <cleako@gmail.com>
Date: Sat, 11 Aug 2018 19:19:50 -0400
Subject: [PATCH] Forcing MySQL user and password as "root"

---
 Makefile | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 2a009ab..a052cb5 100644
--- a/Makefile
+++ b/Makefile
@@ -55,16 +55,16 @@ logs:
 backup:
 	@sudo mkdir -p $(MYSQL_DUMPS_DIR)
 	@$(shell sudo chmod -R 777 $(MYSQL_DUMPS_DIR))
-	@docker exec $(shell docker-compose ps -q mysqldb) mysqldump --all-databases -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" > $(MYSQL_DUMPS_DIR)/db.sql 2>/dev/null
+	@docker exec $(shell docker-compose ps -q mysqldb) mysqldump --all-databases -u"root" -p"root" > $(MYSQL_DUMPS_DIR)/db.sql 2>/dev/null
 
 backup-windows:
-	@docker exec -i mysql mysqldump --all-databases -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" > $(MYSQL_DUMPS_DIR)/db.sql
+	@docker exec -i mysql mysqldump --all-databases -u"root" -p"root" > $(MYSQL_DUMPS_DIR)/db.sql
 
 restore:
-	@docker exec -i $(shell docker-compose ps -q mysqldb) mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < $(MYSQL_DUMPS_DIR)/db.sql 2>/dev/null
+	@docker exec -i $(shell docker-compose ps -q mysqldb) mysql -u"root" -p"root" < $(MYSQL_DUMPS_DIR)/db.sql 2>/dev/null
 
 restore-windows:
-	@docker exec -i mysql mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < $(MYSQL_DUMPS_DIR)/db.sql
+	@docker exec -i mysql mysql -u"root" -p"root" < $(MYSQL_DUMPS_DIR)/db.sql
 
 import-game:
 	@docker exec -i $(shell docker-compose ps -q mysqldb) mysql -u"root" -p"root" < Game/Databases/openrsc_config.sql 2>/dev/null
@@ -79,16 +79,16 @@ import-wiki:
 	@docker exec -i $(shell docker-compose ps -q mysqldb) mysql -u"root" -p"root" < Website/Wiki/openrsc_wiki.sql 2>/dev/null
 
 import-windows-game:
-	@docker exec -i mysql mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Game/Databases/openrsc_logs.sql
-	@docker exec -i mysql mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Game/Databases/openrsc_config.sql
-	@docker exec -i mysql mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Game/Databases/openrsc.sql
-	@docker exec -i mysql mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Game/Databases/openrsc_tools.sql
+	@docker exec -i mysql mysql -u"root" -p"root" < Game/Databases/openrsc_logs.sql
+	@docker exec -i mysql mysql -u"root" -p"root" < Game/Databases/openrsc_config.sql
+	@docker exec -i mysql mysql -u"root" -p"root" < Game/Databases/openrsc.sql
+	@docker exec -i mysql mysql -u"root" -p"root" < Game/Databases/openrsc_tools.sql
 
 import-windows-website:
-	#@docker exec -i mysql mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Website/openrsc_forum.sql
+	#@docker exec -i mysql mysql -u"root" -p"root" < Website/openrsc_forum.sql
 
 import-windows-wiki:
-	@docker exec -i mysql mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Website/Wiki/openrsc_wiki.sql
+	@docker exec -i mysql mysql -u"root" -p"root" < Website/Wiki/openrsc_wiki.sql
 
 flush:
 	@$(shell rm -rf Website && rm -rf Game)