From d383c2c1b6a333e2acd2737246e1f2df6e4e3fdf Mon Sep 17 00:00:00 2001
From: Antoine <antoine.rochebois@insa-lyon.fr>
Date: Fri, 16 Jul 2021 09:29:02 +0000
Subject: [PATCH] serv dist
---
server/{DockerFile => Dockerfile} | 2 +-
server/db.js | 2 +-
server/server.js | 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
rename server/{DockerFile => Dockerfile} (90%)
diff --git a/server/DockerFile b/server/Dockerfile
similarity index 90%
rename from server/DockerFile
rename to server/Dockerfile
index 09bd3ae..9fc6bc6 100644
--- a/server/DockerFile
+++ b/server/Dockerfile
@@ -3,5 +3,5 @@ WORKDIR /usr/src/app
COPY package*.json ./
RUN npm install
COPY . .
-EXPOSE 8080
+EXPOSE 80
CMD [ "node", "server.js" ]
\ No newline at end of file
diff --git a/server/db.js b/server/db.js
index 52ddd59..d6b842b 100644
--- a/server/db.js
+++ b/server/db.js
@@ -1,3 +1,3 @@
module.exports = {
- DB: 'mongodb://localhost:27017/escape_game_dd'
+ DB: 'mongodb://api:yxu83txjn5Whqp6M@mongodb:27017/escape_game_dd?authSource=admin'
}
\ No newline at end of file
diff --git a/server/server.js b/server/server.js
index 102bd05..0cec43d 100644
--- a/server/server.js
+++ b/server/server.js
@@ -11,12 +11,13 @@ const teamRoute = require('./db/team.route')
const passport = require('passport');
const LocalStrategy = require('passport-local').Strategy;
const connectEnsureLogin = require('connect-ensure-login');
-const port = 3000;
+const port = 80;
//Configuration MongoDB
mongoose.Promise = global.Promise;
+console.log("Trying to connect to DB :" +config.DB)
mongoose.connect(config.DB, {useNewUrlParser: true, useUnifiedTopology: true}).then(
() => {console.log('Database connected')},
err => {console.log("Database connection failed :", err)}
--
GitLab