From 4edc90b196876f87c6af67e113aeeda7e6d695a8 Mon Sep 17 00:00:00 2001 From: davwas Date: Fri, 12 Apr 2024 09:45:30 +0200 Subject: [PATCH 01/17] update mongo version --- compose-files/docker-compose.yml | 8 ++++---- envs/default.env | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/compose-files/docker-compose.yml b/compose-files/docker-compose.yml index 5622bd2..3624290 100644 --- a/compose-files/docker-compose.yml +++ b/compose-files/docker-compose.yml @@ -21,7 +21,7 @@ services: ### Schul-Cloud Server ### mongodb: - image: mongo:4.2.9 ## change tag in version.env + image: mongo:5.0.26 ## change tag in version.env container_name: mongodb-primary ports: - "27017:27017" @@ -34,7 +34,7 @@ services: command: --bind_ip_all --replSet rs0 --enableMajorityReadConcern false mongodb-secondary: - image: mongo:4.2.9 ## change tag in version.env + image: mongo:5.0.26 ## change tag in version.env container_name: mongodb-secondary ports: - "27017" @@ -45,7 +45,7 @@ services: command: --bind_ip_all --replSet rs0 --enableMajorityReadConcern false mongodb-arbiter: - image: mongo:4.2.9 ## change tag in version.env + image: mongo:5.0.26 ## change tag in version.env container_name: mongodb-arbiter ports: - "27017" @@ -56,7 +56,7 @@ services: command: --bind_ip_all --replSet rs0 --enableMajorityReadConcern false mongosetup: - image: mongo:4.2.9 + image: mongo:5.0.26 depends_on: - mongodb - mongodb-secondary diff --git a/envs/default.env b/envs/default.env index 6008389..8ae38a8 100644 --- a/envs/default.env +++ b/envs/default.env @@ -4,5 +4,5 @@ COMPOSE_FILES_PATH=./compose-files POSTGRES_DOCKER_TAG=11.9 REDIS_DOCKER_TAG=6.0.8 -MONGO_DOCKER_TAG=4.2.9 +MONGO_DOCKER_TAG=5.0.26 RABBITMQ_DOCKER_TAG=3.8.9-management From 7e23af605a17fc0808e7b367a953b56b5d78abc9 Mon Sep 17 00:00:00 2001 From: davwas Date: Mon, 15 Apr 2024 23:39:53 +0200 Subject: [PATCH 02/17] Revert "update mongo version" This reverts commit 4edc90b196876f87c6af67e113aeeda7e6d695a8. --- compose-files/docker-compose.yml | 8 ++++---- envs/default.env | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/compose-files/docker-compose.yml b/compose-files/docker-compose.yml index 3624290..5622bd2 100644 --- a/compose-files/docker-compose.yml +++ b/compose-files/docker-compose.yml @@ -21,7 +21,7 @@ services: ### Schul-Cloud Server ### mongodb: - image: mongo:5.0.26 ## change tag in version.env + image: mongo:4.2.9 ## change tag in version.env container_name: mongodb-primary ports: - "27017:27017" @@ -34,7 +34,7 @@ services: command: --bind_ip_all --replSet rs0 --enableMajorityReadConcern false mongodb-secondary: - image: mongo:5.0.26 ## change tag in version.env + image: mongo:4.2.9 ## change tag in version.env container_name: mongodb-secondary ports: - "27017" @@ -45,7 +45,7 @@ services: command: --bind_ip_all --replSet rs0 --enableMajorityReadConcern false mongodb-arbiter: - image: mongo:5.0.26 ## change tag in version.env + image: mongo:4.2.9 ## change tag in version.env container_name: mongodb-arbiter ports: - "27017" @@ -56,7 +56,7 @@ services: command: --bind_ip_all --replSet rs0 --enableMajorityReadConcern false mongosetup: - image: mongo:5.0.26 + image: mongo:4.2.9 depends_on: - mongodb - mongodb-secondary diff --git a/envs/default.env b/envs/default.env index 8ae38a8..6008389 100644 --- a/envs/default.env +++ b/envs/default.env @@ -4,5 +4,5 @@ COMPOSE_FILES_PATH=./compose-files POSTGRES_DOCKER_TAG=11.9 REDIS_DOCKER_TAG=6.0.8 -MONGO_DOCKER_TAG=5.0.26 +MONGO_DOCKER_TAG=4.2.9 RABBITMQ_DOCKER_TAG=3.8.9-management From e9e33a644bf55dfc27bcc62fcdd10ed9c0b6fdc2 Mon Sep 17 00:00:00 2001 From: davwas Date: Mon, 15 Apr 2024 23:55:29 +0200 Subject: [PATCH 03/17] update mongo version to 5.0.25 --- compose-files/docker-compose.yml | 8 ++++---- envs/default.env | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/compose-files/docker-compose.yml b/compose-files/docker-compose.yml index 5622bd2..06aa3f9 100644 --- a/compose-files/docker-compose.yml +++ b/compose-files/docker-compose.yml @@ -21,7 +21,7 @@ services: ### Schul-Cloud Server ### mongodb: - image: mongo:4.2.9 ## change tag in version.env + image: mongo:5.0.25 ## change tag in version.env container_name: mongodb-primary ports: - "27017:27017" @@ -34,7 +34,7 @@ services: command: --bind_ip_all --replSet rs0 --enableMajorityReadConcern false mongodb-secondary: - image: mongo:4.2.9 ## change tag in version.env + image: mongo:5.0.25 ## change tag in version.env container_name: mongodb-secondary ports: - "27017" @@ -45,7 +45,7 @@ services: command: --bind_ip_all --replSet rs0 --enableMajorityReadConcern false mongodb-arbiter: - image: mongo:4.2.9 ## change tag in version.env + image: mongo:5.0.25 ## change tag in version.env container_name: mongodb-arbiter ports: - "27017" @@ -56,7 +56,7 @@ services: command: --bind_ip_all --replSet rs0 --enableMajorityReadConcern false mongosetup: - image: mongo:4.2.9 + image: mongo:5.0.25 depends_on: - mongodb - mongodb-secondary diff --git a/envs/default.env b/envs/default.env index 6008389..aabad15 100644 --- a/envs/default.env +++ b/envs/default.env @@ -4,5 +4,5 @@ COMPOSE_FILES_PATH=./compose-files POSTGRES_DOCKER_TAG=11.9 REDIS_DOCKER_TAG=6.0.8 -MONGO_DOCKER_TAG=4.2.9 +MONGO_DOCKER_TAG=5.0.25 RABBITMQ_DOCKER_TAG=3.8.9-management From a847c237d13b71bf18a2bdc9581296b12ca436b5 Mon Sep 17 00:00:00 2001 From: davwas Date: Tue, 16 Apr 2024 09:06:04 +0200 Subject: [PATCH 04/17] update mongo version to 5.0 --- compose-files/docker-compose.yml | 8 ++++---- envs/default.env | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/compose-files/docker-compose.yml b/compose-files/docker-compose.yml index 06aa3f9..b47a836 100644 --- a/compose-files/docker-compose.yml +++ b/compose-files/docker-compose.yml @@ -21,7 +21,7 @@ services: ### Schul-Cloud Server ### mongodb: - image: mongo:5.0.25 ## change tag in version.env + image: mongo:5.0 ## change tag in version.env container_name: mongodb-primary ports: - "27017:27017" @@ -34,7 +34,7 @@ services: command: --bind_ip_all --replSet rs0 --enableMajorityReadConcern false mongodb-secondary: - image: mongo:5.0.25 ## change tag in version.env + image: mongo:5.0 ## change tag in version.env container_name: mongodb-secondary ports: - "27017" @@ -45,7 +45,7 @@ services: command: --bind_ip_all --replSet rs0 --enableMajorityReadConcern false mongodb-arbiter: - image: mongo:5.0.25 ## change tag in version.env + image: mongo:5.0 ## change tag in version.env container_name: mongodb-arbiter ports: - "27017" @@ -56,7 +56,7 @@ services: command: --bind_ip_all --replSet rs0 --enableMajorityReadConcern false mongosetup: - image: mongo:5.0.25 + image: mongo:5.0 depends_on: - mongodb - mongodb-secondary diff --git a/envs/default.env b/envs/default.env index aabad15..9727a46 100644 --- a/envs/default.env +++ b/envs/default.env @@ -4,5 +4,5 @@ COMPOSE_FILES_PATH=./compose-files POSTGRES_DOCKER_TAG=11.9 REDIS_DOCKER_TAG=6.0.8 -MONGO_DOCKER_TAG=5.0.25 +MONGO_DOCKER_TAG=5.0 RABBITMQ_DOCKER_TAG=3.8.9-management From 054e1da05ee12113e7af6e88bd63843bb7d2632c Mon Sep 17 00:00:00 2001 From: davwas Date: Tue, 16 Apr 2024 09:32:41 +0200 Subject: [PATCH 05/17] revert mongo update --- compose-files/docker-compose.yml | 8 ++++---- envs/default.env | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/compose-files/docker-compose.yml b/compose-files/docker-compose.yml index b47a836..5622bd2 100644 --- a/compose-files/docker-compose.yml +++ b/compose-files/docker-compose.yml @@ -21,7 +21,7 @@ services: ### Schul-Cloud Server ### mongodb: - image: mongo:5.0 ## change tag in version.env + image: mongo:4.2.9 ## change tag in version.env container_name: mongodb-primary ports: - "27017:27017" @@ -34,7 +34,7 @@ services: command: --bind_ip_all --replSet rs0 --enableMajorityReadConcern false mongodb-secondary: - image: mongo:5.0 ## change tag in version.env + image: mongo:4.2.9 ## change tag in version.env container_name: mongodb-secondary ports: - "27017" @@ -45,7 +45,7 @@ services: command: --bind_ip_all --replSet rs0 --enableMajorityReadConcern false mongodb-arbiter: - image: mongo:5.0 ## change tag in version.env + image: mongo:4.2.9 ## change tag in version.env container_name: mongodb-arbiter ports: - "27017" @@ -56,7 +56,7 @@ services: command: --bind_ip_all --replSet rs0 --enableMajorityReadConcern false mongosetup: - image: mongo:5.0 + image: mongo:4.2.9 depends_on: - mongodb - mongodb-secondary diff --git a/envs/default.env b/envs/default.env index 9727a46..6008389 100644 --- a/envs/default.env +++ b/envs/default.env @@ -4,5 +4,5 @@ COMPOSE_FILES_PATH=./compose-files POSTGRES_DOCKER_TAG=11.9 REDIS_DOCKER_TAG=6.0.8 -MONGO_DOCKER_TAG=5.0 +MONGO_DOCKER_TAG=4.2.9 RABBITMQ_DOCKER_TAG=3.8.9-management From 0aa73a594ca2be4722744fa2328d787f5b929ac6 Mon Sep 17 00:00:00 2001 From: davwas Date: Tue, 16 Apr 2024 09:54:28 +0200 Subject: [PATCH 06/17] update mongo --- compose-files/docker-compose.yml | 8 ++++---- envs/default.env | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/compose-files/docker-compose.yml b/compose-files/docker-compose.yml index 5622bd2..3624290 100644 --- a/compose-files/docker-compose.yml +++ b/compose-files/docker-compose.yml @@ -21,7 +21,7 @@ services: ### Schul-Cloud Server ### mongodb: - image: mongo:4.2.9 ## change tag in version.env + image: mongo:5.0.26 ## change tag in version.env container_name: mongodb-primary ports: - "27017:27017" @@ -34,7 +34,7 @@ services: command: --bind_ip_all --replSet rs0 --enableMajorityReadConcern false mongodb-secondary: - image: mongo:4.2.9 ## change tag in version.env + image: mongo:5.0.26 ## change tag in version.env container_name: mongodb-secondary ports: - "27017" @@ -45,7 +45,7 @@ services: command: --bind_ip_all --replSet rs0 --enableMajorityReadConcern false mongodb-arbiter: - image: mongo:4.2.9 ## change tag in version.env + image: mongo:5.0.26 ## change tag in version.env container_name: mongodb-arbiter ports: - "27017" @@ -56,7 +56,7 @@ services: command: --bind_ip_all --replSet rs0 --enableMajorityReadConcern false mongosetup: - image: mongo:4.2.9 + image: mongo:5.0.26 depends_on: - mongodb - mongodb-secondary diff --git a/envs/default.env b/envs/default.env index 6008389..8ae38a8 100644 --- a/envs/default.env +++ b/envs/default.env @@ -4,5 +4,5 @@ COMPOSE_FILES_PATH=./compose-files POSTGRES_DOCKER_TAG=11.9 REDIS_DOCKER_TAG=6.0.8 -MONGO_DOCKER_TAG=4.2.9 +MONGO_DOCKER_TAG=5.0.26 RABBITMQ_DOCKER_TAG=3.8.9-management From 032e3f8f420d85f1d2f59848ef25a75ff92dc031 Mon Sep 17 00:00:00 2001 From: davwas Date: Tue, 16 Apr 2024 13:31:27 +0200 Subject: [PATCH 07/17] change branch name --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9091cfa..6635fea 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,7 +18,7 @@ jobs: git config --global url."https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/".insteadOf "ssh://git@github.com/" git config --global url."https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/".insteadOf "git@github.com:" - name: execute tests - run: curl "https://raw.githubusercontent.com/hpi-schul-cloud/end-to-end-tests/main/scripts/ci/fetch.github.sh" | bash + run: curl "https://raw.githubusercontent.com/hpi-schul-cloud/end-to-end-tests/BC-6654-update-mongodb/scripts/ci/fetch.github.sh" | bash env: ES_USER: ${{ secrets.ES_USER }} ES_PASSWORD: ${{ secrets.ES_PASSWORD }} From c494b841cfcb4af8d517f8658c8dd4da4f94e90b Mon Sep 17 00:00:00 2001 From: davwas Date: Tue, 16 Apr 2024 14:00:33 +0200 Subject: [PATCH 08/17] update db url --- compose-files/docker-compose.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/compose-files/docker-compose.yml b/compose-files/docker-compose.yml index 3624290..32787b7 100644 --- a/compose-files/docker-compose.yml +++ b/compose-files/docker-compose.yml @@ -20,7 +20,7 @@ services: ### Schul-Cloud Server ### - mongodb: + mongodb-primary: image: mongo:5.0.26 ## change tag in version.env container_name: mongodb-primary ports: @@ -58,7 +58,7 @@ services: mongosetup: image: mongo:5.0.26 depends_on: - - mongodb + - mongodb-primary - mongodb-secondary - mongodb-arbiter volumes: @@ -146,7 +146,7 @@ services: - CLAMAV__SERVICE_HOSTNAME=localhost - CLAMAV__SERVICE_PORT=3310 # URIs and Port - - DB_URL=mongodb://mongodb:27017,mongodb-secondary:27017,mongodb-arbiter:27017/schulcloud?replicaSet=rs0&tls=false&readPreference=secondary + - DB_URL=mongodb://mongodb-primary:27017,mongodb-secondary:27017,mongodb-arbiter:27017/schulcloud?replicaSet=rs0&tls=false&readPreference=secondary - DATABASE__URL=mongodb://server-mongodb:27017/schulcloud - REDIS_URI=redis://redis:6379 - RABBITMQ_URI=amqp://guest:guest@rabbit:5672 @@ -207,7 +207,7 @@ services: - FILES_STORAGE__S3_BUCKET=schulcloud - FILES_STORAGE__S3_REGION=eu-central-1 # URIs and Port - - DB_URL=mongodb://mongodb:27017,mongodb-secondary:27017,mongodb-arbiter:27017/schulcloud?replicaSet=rs0&tls=false&readPreference=secondary + - DB_URL=mongodb://mongodb-primary:27017,mongodb-secondary:27017,mongodb-arbiter:27017/schulcloud?replicaSet=rs0&tls=false&readPreference=secondary - DATABASE__URL=mongodb://server-mongodb:27017/schulcloud - REDIS_URI=redis://redis:6379 - RABBITMQ_URI=amqp://guest:guest@rabbit:5672 From f4926f0761fb806353762cfa76876f97e6fd6355 Mon Sep 17 00:00:00 2001 From: davwas Date: Tue, 16 Apr 2024 14:08:48 +0200 Subject: [PATCH 09/17] delete database urls --- compose-files/docker-compose.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/compose-files/docker-compose.yml b/compose-files/docker-compose.yml index 32787b7..a3f15d6 100644 --- a/compose-files/docker-compose.yml +++ b/compose-files/docker-compose.yml @@ -147,7 +147,6 @@ services: - CLAMAV__SERVICE_PORT=3310 # URIs and Port - DB_URL=mongodb://mongodb-primary:27017,mongodb-secondary:27017,mongodb-arbiter:27017/schulcloud?replicaSet=rs0&tls=false&readPreference=secondary - - DATABASE__URL=mongodb://server-mongodb:27017/schulcloud - REDIS_URI=redis://redis:6379 - RABBITMQ_URI=amqp://guest:guest@rabbit:5672 - CONTENT_URI=https://consent.schul-cloud.org #lernstore @@ -208,7 +207,6 @@ services: - FILES_STORAGE__S3_REGION=eu-central-1 # URIs and Port - DB_URL=mongodb://mongodb-primary:27017,mongodb-secondary:27017,mongodb-arbiter:27017/schulcloud?replicaSet=rs0&tls=false&readPreference=secondary - - DATABASE__URL=mongodb://server-mongodb:27017/schulcloud - REDIS_URI=redis://redis:6379 - RABBITMQ_URI=amqp://guest:guest@rabbit:5672 - CONTENT_URI=https://consent.schul-cloud.org #lernstore From cdf44c01cd024e895a565133de6838c17075133a Mon Sep 17 00:00:00 2001 From: davwas Date: Tue, 16 Apr 2024 14:16:18 +0200 Subject: [PATCH 10/17] fix mongo setup --- scripts/mongo_setup.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/mongo_setup.sh b/scripts/mongo_setup.sh index 3c3545c..c21e9b7 100644 --- a/scripts/mongo_setup.sh +++ b/scripts/mongo_setup.sh @@ -2,15 +2,15 @@ sleep 10 echo SETUP.sh time now: `date +"%T" ` -mongo --host mongodb:27017 --eval 'rs.initiate({_id: "rs0", members: [{_id: 0, host: "mongodb:27017" }]})' -mongo --host mongodb:27017 << EOF +mongo --host mongodb-primary:27017 --eval 'rs.initiate({_id: "rs0", members: [{_id: 0, host: "mongodb-primary:27017" }]})' +mongo --host mongodb-primary:27017 << EOF var cfg = { "_id": "rs0", "version": 1, "members": [ { "_id": 0, - "host": "mongodb:27017", + "host": "mongodb-primary:27017", "priority": 2, "votes": 1 }, From fde4e7322bfcf0a7ab42aaf496935ee48ce229ba Mon Sep 17 00:00:00 2001 From: davwas Date: Tue, 16 Apr 2024 14:24:52 +0200 Subject: [PATCH 11/17] fix docker notification --- compose-files/docker-compose.notification.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose-files/docker-compose.notification.yml b/compose-files/docker-compose.notification.yml index d47a458..bfa7849 100644 --- a/compose-files/docker-compose.notification.yml +++ b/compose-files/docker-compose.notification.yml @@ -23,12 +23,12 @@ services: - 3031:3031 environment: - NODE_ENV=${NODE_ENV:-development} - - MONGO_HOST=mongodb/notification-service + - MONGO_HOST=mongodb-primary/notification-service - REDIS_HOST=redis - TESTPLATFORM=1 #- NOTIFICATION_PORT=3031 depends_on: - - mongodb + - mongodb-primary - redis - mail From 6d7b679aea6d7cd9a2a81fde7ee9a21ab6a240b0 Mon Sep 17 00:00:00 2001 From: davwas Date: Tue, 16 Apr 2024 14:37:30 +0200 Subject: [PATCH 12/17] Revert "fix docker notification" This reverts commit fde4e7322bfcf0a7ab42aaf496935ee48ce229ba. --- compose-files/docker-compose.notification.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose-files/docker-compose.notification.yml b/compose-files/docker-compose.notification.yml index bfa7849..d47a458 100644 --- a/compose-files/docker-compose.notification.yml +++ b/compose-files/docker-compose.notification.yml @@ -23,12 +23,12 @@ services: - 3031:3031 environment: - NODE_ENV=${NODE_ENV:-development} - - MONGO_HOST=mongodb-primary/notification-service + - MONGO_HOST=mongodb/notification-service - REDIS_HOST=redis - TESTPLATFORM=1 #- NOTIFICATION_PORT=3031 depends_on: - - mongodb-primary + - mongodb - redis - mail From 040fd75f9cd4c6c4f45304b29fcc45c11ee51ed3 Mon Sep 17 00:00:00 2001 From: davwas Date: Tue, 16 Apr 2024 14:55:29 +0200 Subject: [PATCH 13/17] add directConnection --- compose-files/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose-files/docker-compose.yml b/compose-files/docker-compose.yml index a3f15d6..700cb5e 100644 --- a/compose-files/docker-compose.yml +++ b/compose-files/docker-compose.yml @@ -146,7 +146,7 @@ services: - CLAMAV__SERVICE_HOSTNAME=localhost - CLAMAV__SERVICE_PORT=3310 # URIs and Port - - DB_URL=mongodb://mongodb-primary:27017,mongodb-secondary:27017,mongodb-arbiter:27017/schulcloud?replicaSet=rs0&tls=false&readPreference=secondary + - DB_URL=mongodb://mongodb-primary:27017,mongodb-secondary:27017,mongodb-arbiter:27017/schulcloud?directConnection=true&replicaSet=rs0&tls=false&readPreference=secondary - REDIS_URI=redis://redis:6379 - RABBITMQ_URI=amqp://guest:guest@rabbit:5672 - CONTENT_URI=https://consent.schul-cloud.org #lernstore @@ -206,7 +206,7 @@ services: - FILES_STORAGE__S3_BUCKET=schulcloud - FILES_STORAGE__S3_REGION=eu-central-1 # URIs and Port - - DB_URL=mongodb://mongodb-primary:27017,mongodb-secondary:27017,mongodb-arbiter:27017/schulcloud?replicaSet=rs0&tls=false&readPreference=secondary + - DB_URL=mongodb://mongodb-primary:27017,mongodb-secondary:27017,mongodb-arbiter:27017/schulcloud?directConnection=true&replicaSet=rs0&tls=false&readPreference=secondary - REDIS_URI=redis://redis:6379 - RABBITMQ_URI=amqp://guest:guest@rabbit:5672 - CONTENT_URI=https://consent.schul-cloud.org #lernstore From 8f0b8a791777a6dee275bde301afeb7c31c3be34 Mon Sep 17 00:00:00 2001 From: davwas Date: Tue, 16 Apr 2024 15:06:53 +0200 Subject: [PATCH 14/17] Revert "add directConnection" This reverts commit 040fd75f9cd4c6c4f45304b29fcc45c11ee51ed3. --- compose-files/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose-files/docker-compose.yml b/compose-files/docker-compose.yml index 700cb5e..a3f15d6 100644 --- a/compose-files/docker-compose.yml +++ b/compose-files/docker-compose.yml @@ -146,7 +146,7 @@ services: - CLAMAV__SERVICE_HOSTNAME=localhost - CLAMAV__SERVICE_PORT=3310 # URIs and Port - - DB_URL=mongodb://mongodb-primary:27017,mongodb-secondary:27017,mongodb-arbiter:27017/schulcloud?directConnection=true&replicaSet=rs0&tls=false&readPreference=secondary + - DB_URL=mongodb://mongodb-primary:27017,mongodb-secondary:27017,mongodb-arbiter:27017/schulcloud?replicaSet=rs0&tls=false&readPreference=secondary - REDIS_URI=redis://redis:6379 - RABBITMQ_URI=amqp://guest:guest@rabbit:5672 - CONTENT_URI=https://consent.schul-cloud.org #lernstore @@ -206,7 +206,7 @@ services: - FILES_STORAGE__S3_BUCKET=schulcloud - FILES_STORAGE__S3_REGION=eu-central-1 # URIs and Port - - DB_URL=mongodb://mongodb-primary:27017,mongodb-secondary:27017,mongodb-arbiter:27017/schulcloud?directConnection=true&replicaSet=rs0&tls=false&readPreference=secondary + - DB_URL=mongodb://mongodb-primary:27017,mongodb-secondary:27017,mongodb-arbiter:27017/schulcloud?replicaSet=rs0&tls=false&readPreference=secondary - REDIS_URI=redis://redis:6379 - RABBITMQ_URI=amqp://guest:guest@rabbit:5672 - CONTENT_URI=https://consent.schul-cloud.org #lernstore From 03db1400811b66eebe5c63f98d586c36db1c6fd7 Mon Sep 17 00:00:00 2001 From: davwas Date: Tue, 16 Apr 2024 17:22:03 +0200 Subject: [PATCH 15/17] remove enableMajorityReadConcern --- compose-files/docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compose-files/docker-compose.yml b/compose-files/docker-compose.yml index a3f15d6..f623e68 100644 --- a/compose-files/docker-compose.yml +++ b/compose-files/docker-compose.yml @@ -31,7 +31,7 @@ services: - mongodb-secondary - mongodb-arbiter restart: unless-stopped - command: --bind_ip_all --replSet rs0 --enableMajorityReadConcern false + command: --bind_ip_all --replSet rs0 mongodb-secondary: image: mongo:5.0.26 ## change tag in version.env @@ -42,7 +42,7 @@ services: volumes: - data-mongodb-secondary:/data/db restart: unless-stopped - command: --bind_ip_all --replSet rs0 --enableMajorityReadConcern false + command: --bind_ip_all --replSet rs0 mongodb-arbiter: image: mongo:5.0.26 ## change tag in version.env @@ -53,7 +53,7 @@ services: volumes: - data-mongodb-arbiter:/data/db restart: unless-stopped - command: --bind_ip_all --replSet rs0 --enableMajorityReadConcern false + command: --bind_ip_all --replSet rs0 mongosetup: image: mongo:5.0.26 From 648b6ff5a27bce531e5d12c20d4335db74153820 Mon Sep 17 00:00:00 2001 From: davwas Date: Wed, 17 Apr 2024 12:01:09 +0200 Subject: [PATCH 16/17] change branch name to main --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6635fea..9091cfa 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,7 +18,7 @@ jobs: git config --global url."https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/".insteadOf "ssh://git@github.com/" git config --global url."https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/".insteadOf "git@github.com:" - name: execute tests - run: curl "https://raw.githubusercontent.com/hpi-schul-cloud/end-to-end-tests/BC-6654-update-mongodb/scripts/ci/fetch.github.sh" | bash + run: curl "https://raw.githubusercontent.com/hpi-schul-cloud/end-to-end-tests/main/scripts/ci/fetch.github.sh" | bash env: ES_USER: ${{ secrets.ES_USER }} ES_PASSWORD: ${{ secrets.ES_PASSWORD }} From 21315776e9498f67551d6dedf60d91be40dd8d6b Mon Sep 17 00:00:00 2001 From: davwas Date: Wed, 17 Apr 2024 12:02:18 +0200 Subject: [PATCH 17/17] remove readPreference --- compose-files/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose-files/docker-compose.yml b/compose-files/docker-compose.yml index f623e68..f1452bd 100644 --- a/compose-files/docker-compose.yml +++ b/compose-files/docker-compose.yml @@ -146,7 +146,7 @@ services: - CLAMAV__SERVICE_HOSTNAME=localhost - CLAMAV__SERVICE_PORT=3310 # URIs and Port - - DB_URL=mongodb://mongodb-primary:27017,mongodb-secondary:27017,mongodb-arbiter:27017/schulcloud?replicaSet=rs0&tls=false&readPreference=secondary + - DB_URL=mongodb://mongodb-primary:27017,mongodb-secondary:27017,mongodb-arbiter:27017/schulcloud?replicaSet=rs0&tls=false - REDIS_URI=redis://redis:6379 - RABBITMQ_URI=amqp://guest:guest@rabbit:5672 - CONTENT_URI=https://consent.schul-cloud.org #lernstore @@ -206,7 +206,7 @@ services: - FILES_STORAGE__S3_BUCKET=schulcloud - FILES_STORAGE__S3_REGION=eu-central-1 # URIs and Port - - DB_URL=mongodb://mongodb-primary:27017,mongodb-secondary:27017,mongodb-arbiter:27017/schulcloud?replicaSet=rs0&tls=false&readPreference=secondary + - DB_URL=mongodb://mongodb-primary:27017,mongodb-secondary:27017,mongodb-arbiter:27017/schulcloud?replicaSet=rs0&tls=false - REDIS_URI=redis://redis:6379 - RABBITMQ_URI=amqp://guest:guest@rabbit:5672 - CONTENT_URI=https://consent.schul-cloud.org #lernstore