From 5678950806082c686ef068ccdba1f15e7b2bece7 Mon Sep 17 00:00:00 2001
From: vincentastolfi <vincent.astolfi@etu.uca.fr>
Date: Tue, 6 Aug 2024 19:41:27 +0200
Subject: [PATCH] :green_heart: update docker

---
 Dockerfile         | 14 +++++++++++---
 docker-compose.yml | 12 ++++--------
 index.js           |  2 +-
 package.json       |  1 +
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3d9d875..64889ab 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,16 @@
-FROM node:16
+FROM node:14
+
 WORKDIR /usr/src/app
 COPY package*.json ./
 RUN npm install
 COPY . .
 #RUN sed -i '1i\<base href="https://codefirst.iut.uca.fr/containers/vincentastolfi-maettleship/">' ./public/index.html 
-EXPOSE 8080
-CMD ["npm", "run", "start"]
\ No newline at end of file
+
+EXPOSE 3000
+
+ENV DB_HOST=db
+ENV DB_USER=root
+ENV DB_PASSWORD=password
+ENV DB_NAME=battleship
+
+CMD ["npm", "run", "prod"]
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 5af5cb8..4ad28c0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,34 +1,30 @@
-version: '3'
 services:
   app:
     build:
       context: .
       dockerfile: Dockerfile
     ports:
-      - "8080:8080"
+      - "3000:3000"
     volumes:
       - .:/usr/src/app
       - /usr/src/app/node_modules
     environment:
-      - NODE_ENV=production
       - DB_HOST=db
       - DB_USER=root
       - DB_PASSWORD=password
-      - DB_NAME=myapp
+      - DB_NAME=battleship
     depends_on:
       - db
   
   db:
-    platform: linux/x86_64
-    image: mysql:5.7
+    image: mysql:8.0
     restart: always
     environment:
       MYSQL_ROOT_PASSWORD: password
-      MYSQL_DATABASE: myapp
     ports:
       - "3306:3306"
     volumes:
       - db_data:/var/lib/mysql
 
 volumes:
-  db_data:
\ No newline at end of file
+  db_data:
diff --git a/index.js b/index.js
index db02723..6be7eff 100644
--- a/index.js
+++ b/index.js
@@ -2,7 +2,7 @@ const express = require("express");
 const app = express();
 const http = require("http").Server(app);
 const io = require("socket.io")(http);
-const port = 8080;
+const port = 3000;
 const db = require("./database.js")
 const jwt = require('jsonwebtoken');
 const cookieParser = require('cookie-parser');
diff --git a/package.json b/package.json
index 77fc228..ce65962 100644
--- a/package.json
+++ b/package.json
@@ -4,6 +4,7 @@
   "description": "Simple online battleship game that I design for mae when lectures are boring",
   "main": "index.js",
   "scripts": {
+    "prod": "node index.js",
     "dev": "nodemon --env-file=.env index.js",
     "start": "node --env-file=.env index.js"
   },