From 54324794e97829ee0ad72b21724ae2aa1f651576 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Y=C3=BBki=20Vachot?= Date: Tue, 2 Nov 2021 14:59:31 +0100 Subject: [PATCH] Docker ready --- backend/app/config/mongodb.config.js | 3 ++- backend/app/models/mongodb.model.js | 9 +++++++-- backend/server.js | 1 + 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/backend/app/config/mongodb.config.js b/backend/app/config/mongodb.config.js index 14998f2..d267abf 100644 --- a/backend/app/config/mongodb.config.js +++ b/backend/app/config/mongodb.config.js @@ -1,3 +1,4 @@ module.exports = { - url: "mongodb://mongodb:27017/polynotfound" + prodUrl: "mongodb://mongodb:27017/polynotfound", + devUrl: "mongodb://127.0.0.1:27017/polynotfound" }; diff --git a/backend/app/models/mongodb.model.js b/backend/app/models/mongodb.model.js index 1302bc4..18542b9 100644 --- a/backend/app/models/mongodb.model.js +++ b/backend/app/models/mongodb.model.js @@ -1,11 +1,16 @@ const dbConfig = require("../config/mongodb.config"); - const mongoose = require("mongoose"); mongoose.Promise = global.Promise; const db = {}; db.mongoose = mongoose; -db.url = dbConfig.url; + +if(typeof process.env.NODE_ENV !== 'undefined' && process.env.NODE_ENV === 'production'){ + db.url = dbConfig.prodUrl; +} else { + db.url = dbConfig.devUrl; +} + db.users = require("./user.model")(mongoose); db.playlists = require("./playlist.model")(mongoose); db.ads = require("./ad.model")(mongoose); diff --git a/backend/server.js b/backend/server.js index 3f89962..881a30c 100644 --- a/backend/server.js +++ b/backend/server.js @@ -13,6 +13,7 @@ const cors = require('cors'); app.use(cors({origin: 'http://localhost:4200', credentials: true})); const db = require("./app/models/mongodb.model"); +console.log("Db Url: ",db.url); db.mongoose .connect(db.url, { useNewUrlParser: true,