Parcourir la source

Update of Mongo Dockerfile

Jérôme BUISINE il y a 5 ans
Parent
commit
22a16b03dd
3 fichiers modifiés avec 12 ajouts et 11 suppressions
  1. 1 1
      config.js
  2. 11 9
      docker-compose.yml
  3. 0 1
      server/index.js

+ 1 - 1
config.js

@@ -16,7 +16,7 @@ export const imageServedUrl = apiPrefix + '/images'
 export const serverPort = parseInt(process.env.PORT, 10) || 5000
 
 // MongoDB database connection URI
-export const mongoDatabaseURI = process.env.MONGO_URI || 'mongodb://localhost/webexpe'
+export const mongoDatabaseURI = process.env.MONGO_URI || 'mongodb://mongo:27017/webexpe'
 
 // The directory where the images are stored
 export const imagesPath = TEST_MODE

+ 11 - 9
docker-compose.yml

@@ -4,21 +4,18 @@ services:
 
     # Documentation : https://docs.docker.com/samples/library/mongo/ 
     mongo:
+        container_name: mongo
         image: mongo
         restart: always
-        environment:
-            MONGO_INITDB_ROOT_USERNAME: common 
-            MONGO_INITDB_ROOT_PASSWORD: webexpe
-
-            # TODO : Remove later if unecessary
-            # MONGO_INITDB_DATABASE: webexpe
-            # DATADIR: "${DATADIR:-data}"
         volumes:
             - "./data:/data/db" # get access to database files
         ports:
            - "27017:27017"
+        networks:
+            - backend
  
     backapp:
+        container_name: backapp
         build:
             context: .
             dockerfile: back.Dockerfile
@@ -29,10 +26,15 @@ services:
             NODE_ENV: production
             SERVE_CLIENT: "${SERVE_CLIENT:-true}"
             PORT: "5000"
+        links:
+            - mongo
         volumes:
             - "${IMAGES_PATH:-./images}:/usr/src/app/images"
             - "./logs:/usr/src/app/logs"
         depends_on:
-            - mongo 
+            - mongo
+        networks:
+            - backend
 
-      
+networks:
+    backend:

+ 0 - 1
server/index.js

@@ -12,7 +12,6 @@ import { apiPrefix, imageServedUrl, serverPort, serveClient, imagesPath, logger
 import startWebSocketServer from './webSocket'
 import connectDb from './database'
 const morgan = require('morgan')
-
 const app = express()
 
 // Activating logging