Bladeren bron

Merge branch 'DockerEnvDbFix' of stefan.stamenovic/diligent-node-api into develop

pull/64/head
radivoje.milutinovic 3 jaren geleden
bovenliggende
commit
e34c5acc5d
3 gewijzigde bestanden met toevoegingen van 16 en 6 verwijderingen
  1. 2
    0
      Dockerfile
  2. 4
    3
      src/config/default.json
  3. 10
    3
      src/database/mongoose.js

+ 2
- 0
Dockerfile Bestand weergeven



RUN npm install RUN npm install


ENV NODE_ENV='docker'

# Bundle app source # Bundle app source
COPY . . COPY . .



+ 4
- 3
src/config/default.json Bestand weergeven

{ {
"Test": "Diligent",
"Connection": "mongodb://127.0.0.1:27017/trampa-dev",
"NODE_ENV": "development"
"Test": "Diligent",
"DbLocalConnection": "mongodb://127.0.0.1:27017/trampa-dev",
"DbDockerConnection": "mongodb://mongo:27017/trampa-dev",
"NODE_ENV": "development"
} }

+ 10
- 3
src/database/mongoose.js Bestand weergeven

const logger = require('../logging/loggerDbCon') const logger = require('../logging/loggerDbCon')
const config = require('config') const config = require('config')


mongoose.connect(config.get('Connection'), {
useNewUrlParser: true
})
if (config.util.getEnv('NODE_ENV') === 'development') {
mongoose.connect(config.get('DbLocalConnection'), {
useNewUrlParser: true
})
}
else if (config.util.getEnv('NODE_ENV') === 'docker'){
mongoose.connect(config.get('DbDockerConnection'), {
useNewUrlParser: true
})
}


mongoose.connection.on('error', err => { mongoose.connection.on('error', err => {
logger.silly('DB connection failed') logger.silly('DB connection failed')

Laden…
Annuleren
Opslaan