Browse Source

fix: some changes to Docker

Kristian Vos 4 years ago
parent
commit
7220470766
3 changed files with 7 additions and 4 deletions
  1. 2 1
      .env.template
  2. 3 1
      docker-compose.yml
  3. 2 2
      setup-mongo-docker.sh

+ 2 - 1
.env.template

@@ -2,12 +2,13 @@ BACKEND_PORT=8080
 FRONTEND_PORT=80
 
 MONGO_PORT=27017
-MONGO_DATABASE=accountmanager
 
 MONGO_ROOT_PASSWORD=PASSWORD_HERE
 MONGO_ROOT_USERNAME=USERNAME_HERE
+MONGO_ROOT_DATABASE=admin
 
 MONGO_USER_PASSWORD=OTHER_PASSWORD_HERE
 MONGO_USER_USERNAME=OTHER_USERNAME_HERE
+MONGO_DATABASE=accountmanager
 
 COMPOSE_PROJECT_NAME=accountmanager

+ 3 - 1
docker-compose.yml

@@ -22,10 +22,12 @@ services:
     environment:
       - MONGO_INITDB_ROOT_USERNAME=${MONGO_ROOT_USERNAME}
       - MONGO_INITDB_ROOT_PASSWORD=${MONGO_ROOT_PASSWORD}
-      - MONGO_INITDB_DATABASE=${MONGO_DATABASE}
+      - MONGO_INITDB_DATABASE=${MONGO_ROOT_DATABASE}
       - MONGO_PORT=${MONGO_PORT}
+      - MONGO_DATABASE=${MONGO_DATABASE}
       - MONGO_ROOT_USERNAME=${MONGO_ROOT_USERNAME}
       - MONGO_ROOT_PASSWORD=${MONGO_ROOT_PASSWORD}
+      - MONGO_ROOT_DATABASE=${MONGO_ROOT_DATABASE}
       - MONGO_USER_USERNAME=${MONGO_USER_USERNAME}
       - MONGO_USER_PASSWORD=${MONGO_USER_PASSWORD}
     volumes:

+ 2 - 2
setup-mongo-docker.sh

@@ -3,6 +3,6 @@
 mongo musare \
         --port ${MONGO_PORT} \
         -u ${MONGO_ROOT_USERNAME} \
-        --authenticationDatabase "admin" \
+        --authenticationDatabase "${MONGO_ROOT_DATABASE}" \
         -p ${MONGO_ROOT_PASSWORD} \
-        --eval "db.createUser({ user: '${MONGO_USER_USERNAME}', pwd: '${MONGO_USER_PASSWORD}', roles:[ { role:'readWrite', db: ${MONGO_DATABASE} } ] } );"
+        --eval "db.createUser({ user: '${MONGO_USER_USERNAME}', pwd: '${MONGO_USER_PASSWORD}', roles:[ { role:'readWrite', db: '${MONGO_DATABASE}' } ] } );"