From f68bb22a01e7d7704f2ccf66632356677677e4a0 Mon Sep 17 00:00:00 2001
From: Sonny <sonnyasdev@gmail.com>
Date: Sun, 16 Apr 2023 20:02:53 +0200
Subject: [PATCH] fix: another fix for docker compose & makefile

---
 docker/dev.docker-compose.yml | 10 ++++++++++
 docker/docker-compose-dev.yml | 13 -------------
 docker/makefile               |  2 +-
 3 files changed, 11 insertions(+), 14 deletions(-)
 create mode 100644 docker/dev.docker-compose.yml
 delete mode 100644 docker/docker-compose-dev.yml

diff --git a/docker/dev.docker-compose.yml b/docker/dev.docker-compose.yml
new file mode 100644
index 0000000..39d7d12
--- /dev/null
+++ b/docker/dev.docker-compose.yml
@@ -0,0 +1,10 @@
+version: "3.8"
+
+services:
+  my-links-db:
+    image: mysql:latest
+    restart: always
+    env_file: 
+      - ../.env
+    ports:
+      - 3306:3306
diff --git a/docker/docker-compose-dev.yml b/docker/docker-compose-dev.yml
deleted file mode 100644
index 598583d..0000000
--- a/docker/docker-compose-dev.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-version: "3.8"
-
-services:
-  my-links-db:
-    image: mysql:latest
-    restart: always
-    environment:
-      MYSQL_USER: ${DB_USER}
-      MYSQL_PASSWORD: ${DB_PASSWORD}
-      MYSQL_ROOT_PASSWORD: ${DB_PASSWORD}
-      MYSQL_DATABASE: ${DB_DATABASE}
-    ports:
-      - 3306:3306
diff --git a/docker/makefile b/docker/makefile
index 000e481..19b85a8 100644
--- a/docker/makefile
+++ b/docker/makefile
@@ -1,5 +1,5 @@
 start-dev:
-	docker compose --env-file ../.env -f ./docker-compose-dev.yml up -d
+	docker compose --env-file ../.env -f ./dev.docker-compose.yml up -d
 
 start-prod:
 	docker-compose --env-file ../.env -f ./docker-compose.yml up -d