fix(dev-tools): upgrade mongo version

ProgrammeVitam · Nov 15, 2023 · 476e3e4 · 476e3e4
1 parent 34ae91a
commit 476e3e4
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 27 deletions.
diff --git a/tools/docker/mongo/mongo_cluster.yml b/tools/docker/mongo/mongo_cluster.yml
@@ -1,9 +1,10 @@
-version: '3'
+version: "3"
 
 services:
   mongo-dev:
-    image: mongo:4.0.6
-    container_name: vitamui-mongo
+    image: mongo:7.0.2
+    container_name:
+      vitamui-mongo
       #    environment:
     # provide your credentials here
     #        - MONGO_INITDB_ROOT_USERNAME=root
@@ -24,8 +25,9 @@ services:
     command: mongod --replSet "rs0" --port=27018
 
   mongo-dev2:
-    image: mongo:4.0.6
-    container_name: vitamui-mongo2
+    image: mongo:7.0.2
+    container_name:
+      vitamui-mongo2
       #    environment:
     # provide your credentials here
     #        - MONGO_INITDB_ROOT_USERNAME=root
@@ -37,28 +39,28 @@ services:
     ports:
       - "27019:27019"
     volumes:
-        # if you wish to setup additional user accounts specific per DB or with different roles you can use following entry point
+      # if you wish to setup additional user accounts specific per DB or with different roles you can use following entry point
       - "$PWD/mongo-entrypoint/:/scripts/mongo/data"
       - "$PWD/replica-set/:/scripts/mongo/replica-set"
 
     # no --auth is needed here as presence of username and password add this option automatically
     command: mongod --replSet "rs0" --port=27019
 
   mongo-dev3:
-    image: mongo:4.0.6
+    image: mongo:7.0.2
     container_name: vitamui-mongo3
-#    environment:
-        # provide your credentials here
-#        - MONGO_INITDB_ROOT_USERNAME=root
-#        - MONGO_INITDB_ROOT_PASSWORD=rootpwd
+    #    environment:
+    # provide your credentials here
+    #        - MONGO_INITDB_ROOT_USERNAME=root
+    #        - MONGO_INITDB_ROOT_PASSWORD=rootpwd
 
     networks:
       - mongo-cluster
 
     ports:
       - "27020:27020"
     volumes:
-        # if you wish to setup additional user accounts specific per DB or with different roles you can use following entry point
+      # if you wish to setup additional user accounts specific per DB or with different roles you can use following entry point
       - "$PWD/mongo-entrypoint/:/scripts/mongo/data"
       - "$PWD/replica-set/:/scripts/mongo/replica-set"
 

diff --git a/tools/docker/mongo/mongo_dev.yml b/tools/docker/mongo/mongo_dev.yml
@@ -1,8 +1,8 @@
-version: '3.5'
+version: "3.5"
 
 services:
   mongo-dev:
-    image: mongo:4.0.6
+    image: mongo:7.0.2
     container_name: vitamui-mongo
     hostname: vitamui-mongo
     #    environment:

diff --git a/tools/docker/mongo/mongo_vars_dev.yml b/tools/docker/mongo/mongo_vars_dev.yml
@@ -3,7 +3,7 @@ pki_dir: "{{lookup('env','PWD')}}/../../../dev-deployment/environments/certs"
 # Overwrite vitamui defaults in order to perform transparent execution of deployment scripts.
 
 gateway:
-  enabled: true
+  enabled: false
 
 vitamui_defaults:
   folder:

diff --git a/tools/docker/mongo/replica-set/000_replicaset_dev.js b/tools/docker/mongo/replica-set/000_replicaset_dev.js
@@ -1,12 +1,12 @@
 rs.initiate({
-    "_id" : "rs0",
-    "members" : [
-        {
-            "_id" : 0,
-            "host" : "vitamui-mongo:27018",
-            "priority": 1,
-            "slaveDelay" : NumberLong(0),
-            "votes" : 1
-        }
-    ]
+  _id: "rs0",
+  members: [
+    {
+      _id: 0,
+      host: "vitamui-mongo:27018",
+      priority: 1,
+      secondaryDelaySecs: NumberLong(0),
+      votes: 1,
+    },
+  ],
 });
diff --git a/tools/docker/mongo/start_dev.sh b/tools/docker/mongo/start_dev.sh
@@ -15,7 +15,7 @@ docker-compose -f ./mongo_dev.yml up -d
 sleep 2
 
 # Create replica set and wait a few before execution other init scripts
-docker exec -it vitamui-mongo /bin/bash -c "mongo --port=27018 < /scripts/mongo/replica-set/000_replicaset_dev.js;sleep 5;mongo --port=27018 < /scripts/mongo/replica-set/00_check_replicaset.js"
+docker exec -it vitamui-mongo /bin/bash -c "mongosh --port=27018 -f /scripts/mongo/replica-set/000_replicaset_dev.js;sleep 5;mongosh --port=27018 -f /scripts/mongo/replica-set/00_check_replicaset.js"
 
 #########################
 

diff --git a/tools/docker/mongo/start_docker_cluster.sh b/tools/docker/mongo/start_docker_cluster.sh
@@ -12,7 +12,7 @@ docker-compose -f ./mongo_cluster.yml up -d
 sleep 2
 
 # Create replica set and wait a few before execution other init scripts
-docker exec -it vitamui-mongo /bin/bash -c "mongo --port=27018 < /scripts/mongo/replica-set/000_replicaset_dev.js;sleep 5;mongo --port=27018 < /scripts/mongo/replica-set/00_check_replicaset.js"
+docker exec -it vitamui-mongo /bin/bash -c "mongosh --port=27018 -f /scripts/mongo/replica-set/000_replicaset_dev.js;sleep 5;mongosh --port=27018 -f /scripts/mongo/replica-set/00_check_replicaset.js"
 
 #########################