From a2a4d145dfc25db7f1b2effebb2170df223e721c Mon Sep 17 00:00:00 2001
From: Sonny <sonnyasdev@gmail.com>
Date: Tue, 31 Oct 2023 20:15:49 +0100
Subject: [PATCH] chore: change makefile targets

---
 Makefile                         | 18 ++++--------------
 dev.docker-compose.yml           |  1 +
 docker-config/mysql-dev-init.sql |  2 +-
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index 26364c2..4777d73 100644
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,8 @@
-CONTAINER_NAME = "docker-my-links-dev-db-1"
-ROOT_PASSWORD = "root_passwd"
-USER_NAME = "my-user"
+db:
+	docker compose -f dev.docker-compose.yml up -d
 
-start-dev:
-	@echo 'Starting DB container'
-	docker compose --env-file ../.env -f ./dev.docker-compose.yml up -d
-
-	@echo 'Waiting for a minute (need to set $(USER_NAME) privileges)'
-	@sleep 1m
-
-	@echo 'Grant privileges for $(USER_NAME)'
-	docker exec -it $(CONTAINER_NAME) mysql -u root -p$(ROOT_PASSWORD) -e "grant ALL PRIVILEGES ON *.* TO '$(USER_NAME)';flush privileges;"
-
-	@echo 'Dont forget to do migrations before run dev'
+dev:
+	npm run dev
 
 prod:
 	docker compose up -d --build
diff --git a/dev.docker-compose.yml b/dev.docker-compose.yml
index 7164c2f..9c44749 100644
--- a/dev.docker-compose.yml
+++ b/dev.docker-compose.yml
@@ -2,6 +2,7 @@ version: "3.8"
 
 services:
   my-links-dev-db:
+    container_name: my-links-dev-db
     image: mysql:latest
     restart: always
     env_file:
diff --git a/docker-config/mysql-dev-init.sql b/docker-config/mysql-dev-init.sql
index 7cb857c..56fbff1 100644
--- a/docker-config/mysql-dev-init.sql
+++ b/docker-config/mysql-dev-init.sql
@@ -1 +1 @@
-CREATE DATABASE mylinks;
\ No newline at end of file
+CREATE DATABASE IF NOT EXISTS mylinks;
\ No newline at end of file