From b5d35d464501cbca4dc4e4ee403c8bb205024b21 Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Fri, 10 Feb 2023 12:29:09 +0200
Subject: [PATCH] Back to MongoDB 6.x

Thanks to urmel1960 and xet7 !

Fixes #4824
---
 .devcontainer/docker-compose.yml |  2 +-
 docker-compose.yml               |  2 +-
 snapcraft.yaml                   | 14 +++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index 41341ce34..112fcca80 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.7'
 services:
 
   wekandb-dev:
-    image: mongo:5
+    image: mongo:6
     container_name: wekan-dev-db
     restart: unless-stopped
     command: mongod --oplogSize 128
diff --git a/docker-compose.yml b/docker-compose.yml
index 10f572941..f3b5a3758 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -98,7 +98,7 @@ services:
     # Quay image does work:
     #   image: quay.io/wekan/mongo:4.4.2-bionic
     # Docker Hub MongoDB image does work:
-    image: mongo:5
+    image: mongo:6
     #-------------------------------------------------------------------------------------
     container_name: wekan-db
     restart: always
diff --git a/snapcraft.yaml b/snapcraft.yaml
index d29a7a23a..82707ab87 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -65,7 +65,7 @@ apps:
 
 parts:
     mongodb:
-        source: https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu2004-5.0.14.tgz
+        source: https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu2004-6.0.4.tgz
         plugin: dump
         stage-packages:
             - libssl1.1
@@ -90,13 +90,13 @@ parts:
         prime:
             - $mongo
 
-    mongosh:
-        source: https://downloads.mongodb.com/compass/mongodb-mongosh_1.6.2_amd64.deb
-        plugin: dump
+#    mongosh:
+#        source: https://downloads.mongodb.com/compass/mongodb-mongosh_1.6.2_amd64.deb
+#        plugin: dump
 
-    mongotools:
-        source: https://fastdl.mongodb.org/tools/db/mongodb-database-tools-ubuntu2004-x86_64-100.6.1.tgz
-        plugin: dump
+#    mongotools:
+#        source: https://fastdl.mongodb.org/tools/db/mongodb-database-tools-ubuntu2004-x86_64-100.6.1.tgz
+#        plugin: dump
 
 #    mongodb44:
 #        source: https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu2004-4.4.18.tgz