diff --git a/server/DockerFile b/server/Dockerfile similarity index 90% rename from server/DockerFile rename to server/Dockerfile index 09bd3ae4f378f7363d4d4fff7afd287017d05842..9fc6bc6ad5762a51bb2ef0a0619bdc34847d36d5 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 52ddd59e99c572c9d3f636e60001579c41fff925..d6b842b4a026cf392d3d600a1c125e98eaa80801 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 102bd0510c19904558a3913138370533e88aad7b..0cec43ddc1eaac82be2de51f83677c3d7da3a10f 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)}