fix: docker compose & makefile

.prettierrc

@@ -1,4 +1,4 @@
 {
-  "tabWidth": 2,
-  "useTabs": false
+  "tabWidth": 4,
+  "useTabs": true
 }

docker/build.sh

@@ -1 +0,0 @@
-docker build -f ./Dockerfile -t sonny/my-links ../

docker/docker-compose.yml

@@ -14,11 +14,8 @@ services:
     restart: always
     volumes:
       - db_volume_data:/var/lib/postgresql/data
-    environment:
-      MYSQL_USER: ${DB_USER}
-      MYSQL_PASSWORD: ${DB_PASSWORD}
-      MYSQL_ROOT_PASSWORD: ${DB_PASSWORD}
-      MYSQL_DATABASE: ${DB_DATABASE}
+    env_file: 
+      - ../.env
     networks:
       - my_links_net
 
@@ -28,8 +25,10 @@ services:
     ports:
       - 3000:3000
     restart: always
+    env_file: 
+      - ../.env
     environment:
-      DATABASE_URL: "mysql://${DB_USER}:${DB_PASSWORD}@my-links-db:3306/${DB_DATABASE}"
+      DATABASE_URL: "mysql://${MYSQL_USER}:${MYSQL_PASSWORD}@my-links-db:3306/${MYSQL_DATABASE}"
     depends_on:
       my-links-db:
         condition: service_started

docker/makefile

@@ -0,0 +1,8 @@
+start-dev:
+	docker compose --env-file ../.env -f ./docker-compose-dev.yml up -d
+
+start-prod:
+	docker-compose --env-file ../.env -f ./docker-compose.yml up -d
+
+build: 
+	docker build -f ./Dockerfile -t sonny/my-links ../

docker/start-dev.sh

@@ -1 +0,0 @@
-docker-compose --env-file ../.env -f ./docker-compose-dev.yml up -d

docker/start.sh

@@ -1 +0,0 @@
-docker-compose --env-file ../.env -f ./docker-compose.yml up -d

example.env

@@ -2,8 +2,6 @@ DB_USER="my_user"
 DB_PASSWORD=""
 DB_DATABASE="my-links"
 
-DATABASE_URL="mysql://${DB_USER}:${DB_PASSWORD}@localhost:3306/${DB_DATABASE}"
-
 NEXTAUTH_URL=http://localhost:3000
 NEXTAUTH_URL_INTERNAL=http://localhost:3000
 

package.json

@@ -8,28 +8,28 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@prisma/client": "^4.10.0",
-    "@svgr/webpack": "^6.5.1",
-    "axios": "^1.3.2",
-    "next": "^13.1.6",
-    "next-auth": "^4.19.2",
+    "@prisma/client": "^4.12.0",
+    "@svgr/webpack": "^7.0.0",
+    "axios": "^1.3.5",
+    "next": "^13.3.0",
+    "next-auth": "^4.22.0",
     "next-connect": "^0.13.0",
     "nprogress": "^0.2.0",
     "react": "^18.2.0",
     "react-confirm-alert": "^3.0.6",
     "react-dom": "^18.2.0",
-    "react-select": "^5.7.0",
-    "sass": "^1.58.0",
-    "sharp": "^0.31.3",
+    "react-select": "^5.7.2",
+    "sass": "^1.62.0",
+    "sharp": "^0.32.0",
     "toastr": "^2.1.4"
   },
   "devDependencies": {
-    "@types/node": "^18.13.0",
+    "@types/node": "^18.15.11",
     "@types/nprogress": "^0.2.0",
-    "@types/react": "^18.0.27",
+    "@types/react": "^18.0.35",
     "eslint": "8",
-    "eslint-config-next": "13.1.6",
-    "prisma": "^4.10.0",
-    "typescript": "4.9.5"
+    "eslint-config-next": "13.3.0",
+    "prisma": "^4.12.0",
+    "typescript": "5.0.4"
   }
 }