From 52bff822cf1db26f9cc76249393c043c47460001 Mon Sep 17 00:00:00 2001 From: Aaron Zielstorff Date: Thu, 15 Jan 2026 09:19:36 +0100 Subject: [PATCH] Updates from MongoDB 5 to MongoDB 8 --- .../docker-compose/docker-compose.yml | 2 +- .../docker-compose/docker-compose.yml | 2 +- ci/docker-compose.yml | 9 ++++--- ci/workflows/test-aas-discovery-mongodb.yml | 7 ++--- ci/workflows/test-aas-environment-mongodb.yml | 7 ++--- .../test-aas-registry-kafka-mongodb.yml | 2 +- .../test-aas-registry-log-mongodb.yml | 2 +- ci/workflows/test-aas-repository-mongodb.yml | 7 ++--- ci/workflows/test-cd-repository-mongodb.yml | 7 ++--- .../test-submodel-registry-kafka-mongodb.yml | 2 +- .../test-submodel-registry-log-mongodb.yml | 2 +- .../test-submodel-repository-mongodb.yml | 7 ++--- examples/BaSyxDynamicRBAC/docker-compose.yaml | 9 ++++--- examples/BaSyxMinimal/docker-compose.yml | 26 +++++++++---------- .../BaSyxQueryLanguage/docker-compose.yml | 7 ++--- 15 files changed, 53 insertions(+), 45 deletions(-) diff --git a/basyx.aasregistry/docker-compose/docker-compose.yml b/basyx.aasregistry/docker-compose/docker-compose.yml index 412a66d6a..b736a1772 100644 --- a/basyx.aasregistry/docker-compose/docker-compose.yml +++ b/basyx.aasregistry/docker-compose/docker-compose.yml @@ -80,7 +80,7 @@ services: - basyx mongodb: - image: mongo:5.0.10 + image: mongo:8 container_name: mongodb environment: MONGO_INITDB_ROOT_USERNAME: admin diff --git a/basyx.submodelregistry/docker-compose/docker-compose.yml b/basyx.submodelregistry/docker-compose/docker-compose.yml index 0441c67a0..5a3ddbf95 100644 --- a/basyx.submodelregistry/docker-compose/docker-compose.yml +++ b/basyx.submodelregistry/docker-compose/docker-compose.yml @@ -80,7 +80,7 @@ services: - basyx-submodel mongodb: - image: mongo:5.0.10 + image: mongo:8 container_name: mongodb environment: MONGO_INITDB_ROOT_USERNAME: admin diff --git a/ci/docker-compose.yml b/ci/docker-compose.yml index c54e902e7..35048dd4b 100644 --- a/ci/docker-compose.yml +++ b/ci/docker-compose.yml @@ -16,16 +16,17 @@ services: - basyx-java-server-sdk mongo: - image: mongo:5.0.10 + image: mongo:8 restart: always environment: MONGO_INITDB_ROOT_USERNAME: mongoAdmin MONGO_INITDB_ROOT_PASSWORD: mongoPassword healthcheck: - test: mongo + test: ["CMD-SHELL", "mongosh --quiet --username \"$MONGO_INITDB_ROOT_USERNAME\" --password \"$MONGO_INITDB_ROOT_PASSWORD\" --authenticationDatabase admin --eval \"db.adminCommand({ ping: 1 })\" || exit 1"] interval: 10s - start_period: 5s - retries: 5 + timeout: 5s + start_period: 20s + retries: 10 ports: - 27017:27017 networks: diff --git a/ci/workflows/test-aas-discovery-mongodb.yml b/ci/workflows/test-aas-discovery-mongodb.yml index 824230b62..88569f19e 100644 --- a/ci/workflows/test-aas-discovery-mongodb.yml +++ b/ci/workflows/test-aas-discovery-mongodb.yml @@ -17,14 +17,15 @@ services: mongo: condition: service_healthy mongo: - image: mongo:5.0.10 + image: mongo:8 container_name: mongo environment: MONGO_INITDB_ROOT_USERNAME: mongoAdmin MONGO_INITDB_ROOT_PASSWORD: mongoPassword restart: always healthcheck: - test: mongo + test: ["CMD-SHELL", "mongosh --quiet --username \"$MONGO_INITDB_ROOT_USERNAME\" --password \"$MONGO_INITDB_ROOT_PASSWORD\" --authenticationDatabase admin --eval \"db.adminCommand({ ping: 1 })\" || exit 1"] interval: 10s timeout: 5s - retries: 5 + start_period: 20s + retries: 10 diff --git a/ci/workflows/test-aas-environment-mongodb.yml b/ci/workflows/test-aas-environment-mongodb.yml index ff7288e48..97b7f145b 100644 --- a/ci/workflows/test-aas-environment-mongodb.yml +++ b/ci/workflows/test-aas-environment-mongodb.yml @@ -17,14 +17,15 @@ services: mongo: condition: service_healthy mongo: - image: mongo:5.0.10 + image: mongo:8 container_name: mongo environment: MONGO_INITDB_ROOT_USERNAME: mongoAdmin MONGO_INITDB_ROOT_PASSWORD: mongoPassword restart: always healthcheck: - test: mongo + test: ["CMD-SHELL", "mongosh --quiet --username \"$MONGO_INITDB_ROOT_USERNAME\" --password \"$MONGO_INITDB_ROOT_PASSWORD\" --authenticationDatabase admin --eval \"db.adminCommand({ ping: 1 })\" || exit 1"] interval: 10s timeout: 5s - retries: 5 + start_period: 20s + retries: 10 diff --git a/ci/workflows/test-aas-registry-kafka-mongodb.yml b/ci/workflows/test-aas-registry-kafka-mongodb.yml index 487325eaf..352e6d4fb 100644 --- a/ci/workflows/test-aas-registry-kafka-mongodb.yml +++ b/ci/workflows/test-aas-registry-kafka-mongodb.yml @@ -80,7 +80,7 @@ services: - basyx mongodb: - image: mongo:5.0.10 + image: mongo:8 container_name: mongodb environment: MONGO_INITDB_ROOT_USERNAME: admin diff --git a/ci/workflows/test-aas-registry-log-mongodb.yml b/ci/workflows/test-aas-registry-log-mongodb.yml index 8e2618c33..ce7230e5f 100644 --- a/ci/workflows/test-aas-registry-log-mongodb.yml +++ b/ci/workflows/test-aas-registry-log-mongodb.yml @@ -24,7 +24,7 @@ services: - basyx mongodb: - image: mongo:5.0.10 + image: mongo:8 container_name: mongodb environment: MONGO_INITDB_ROOT_USERNAME: admin diff --git a/ci/workflows/test-aas-repository-mongodb.yml b/ci/workflows/test-aas-repository-mongodb.yml index 6f51d24d6..d156893da 100644 --- a/ci/workflows/test-aas-repository-mongodb.yml +++ b/ci/workflows/test-aas-repository-mongodb.yml @@ -17,14 +17,15 @@ services: mongo: condition: service_healthy mongo: - image: mongo:5.0.10 + image: mongo:8 container_name: mongo environment: MONGO_INITDB_ROOT_USERNAME: mongoAdmin MONGO_INITDB_ROOT_PASSWORD: mongoPassword restart: always healthcheck: - test: mongo + test: ["CMD-SHELL", "mongosh --quiet --username \"$MONGO_INITDB_ROOT_USERNAME\" --password \"$MONGO_INITDB_ROOT_PASSWORD\" --authenticationDatabase admin --eval \"db.adminCommand({ ping: 1 })\" || exit 1"] interval: 10s timeout: 5s - retries: 5 + start_period: 20s + retries: 10 diff --git a/ci/workflows/test-cd-repository-mongodb.yml b/ci/workflows/test-cd-repository-mongodb.yml index 5ccdc4d10..157389c6c 100644 --- a/ci/workflows/test-cd-repository-mongodb.yml +++ b/ci/workflows/test-cd-repository-mongodb.yml @@ -17,14 +17,15 @@ services: mongo: condition: service_healthy mongo: - image: mongo:5.0.10 + image: mongo:8 container_name: mongo environment: MONGO_INITDB_ROOT_USERNAME: mongoAdmin MONGO_INITDB_ROOT_PASSWORD: mongoPassword restart: always healthcheck: - test: mongo + test: ["CMD-SHELL", "mongosh --quiet --username \"$MONGO_INITDB_ROOT_USERNAME\" --password \"$MONGO_INITDB_ROOT_PASSWORD\" --authenticationDatabase admin --eval \"db.adminCommand({ ping: 1 })\" || exit 1"] interval: 10s timeout: 5s - retries: 5 + start_period: 20s + retries: 10 diff --git a/ci/workflows/test-submodel-registry-kafka-mongodb.yml b/ci/workflows/test-submodel-registry-kafka-mongodb.yml index 027b9a62b..b3d890a3f 100644 --- a/ci/workflows/test-submodel-registry-kafka-mongodb.yml +++ b/ci/workflows/test-submodel-registry-kafka-mongodb.yml @@ -80,7 +80,7 @@ services: - basyx-submodel mongodb: - image: mongo:5.0.10 + image: mongo:8 container_name: mongodb environment: MONGO_INITDB_ROOT_USERNAME: admin diff --git a/ci/workflows/test-submodel-registry-log-mongodb.yml b/ci/workflows/test-submodel-registry-log-mongodb.yml index 2e2bb1fe0..c47eaa6eb 100644 --- a/ci/workflows/test-submodel-registry-log-mongodb.yml +++ b/ci/workflows/test-submodel-registry-log-mongodb.yml @@ -80,7 +80,7 @@ services: - basyx-submodel mongodb: - image: mongo:5.0.10 + image: mongo:8 container_name: mongodb environment: MONGO_INITDB_ROOT_USERNAME: admin diff --git a/ci/workflows/test-submodel-repository-mongodb.yml b/ci/workflows/test-submodel-repository-mongodb.yml index 678614b13..fccf692c6 100644 --- a/ci/workflows/test-submodel-repository-mongodb.yml +++ b/ci/workflows/test-submodel-repository-mongodb.yml @@ -17,14 +17,15 @@ services: mongo: condition: service_healthy mongo: - image: mongo:5.0.10 + image: mongo:8 container_name: mongo environment: MONGO_INITDB_ROOT_USERNAME: mongoAdmin MONGO_INITDB_ROOT_PASSWORD: mongoPassword restart: always healthcheck: - test: mongo + test: ["CMD-SHELL", "mongosh --quiet --username \"$MONGO_INITDB_ROOT_USERNAME\" --password \"$MONGO_INITDB_ROOT_PASSWORD\" --authenticationDatabase admin --eval \"db.adminCommand({ ping: 1 })\" || exit 1"] interval: 10s timeout: 5s - retries: 5 + start_period: 20s + retries: 10 diff --git a/examples/BaSyxDynamicRBAC/docker-compose.yaml b/examples/BaSyxDynamicRBAC/docker-compose.yaml index 2bc8bd1c3..7429064fc 100644 --- a/examples/BaSyxDynamicRBAC/docker-compose.yaml +++ b/examples/BaSyxDynamicRBAC/docker-compose.yaml @@ -1,6 +1,6 @@ services: mongo: - image: mongo:5.0.10 + image: mongo:8 # Provide mongo config restart: always environment: @@ -8,10 +8,11 @@ services: MONGO_INITDB_ROOT_PASSWORD: mongoPassword # Set health checks to wait until mongo has started healthcheck: - test: mongo + test: ["CMD-SHELL", "mongosh --quiet --username \"$MONGO_INITDB_ROOT_USERNAME\" --password \"$MONGO_INITDB_ROOT_PASSWORD\" --authenticationDatabase admin --eval \"db.adminCommand({ ping: 1 })\" || exit 1"] interval: 10s - start_period: 5s - retries: 5 + timeout: 5s + start_period: 20s + retries: 10 # Maps tcp port to host ports: - 27017:27017 diff --git a/examples/BaSyxMinimal/docker-compose.yml b/examples/BaSyxMinimal/docker-compose.yml index e3f8f7bf4..f38a989ef 100644 --- a/examples/BaSyxMinimal/docker-compose.yml +++ b/examples/BaSyxMinimal/docker-compose.yml @@ -1,25 +1,21 @@ services: mongo: - image: mongo:5.0.10 - # Provide mongo config + image: mongo:8 + container_name: mongo restart: always environment: MONGO_INITDB_ROOT_USERNAME: mongoAdmin MONGO_INITDB_ROOT_PASSWORD: mongoPassword - # Set health checks to wait until mongo has started - #volumes: - # - ./data-vol:/data/db healthcheck: - test: mongo + test: ["CMD-SHELL", "mongosh --quiet --username \"$MONGO_INITDB_ROOT_USERNAME\" --password \"$MONGO_INITDB_ROOT_PASSWORD\" --authenticationDatabase admin --eval \"db.adminCommand({ ping: 1 })\" || exit 1"] interval: 10s - start_period: 5s - retries: 5 - # Maps tcp port to host - #ports: - # - 27017:27017 + timeout: 5s + start_period: 20s + retries: 10 mqtt: image: eclipse-mosquitto:2.0.15 + container_name: mosquitto ports: - 1884:1884 volumes: @@ -33,6 +29,7 @@ services: aas-env: image: eclipsebasyx/aas-environment:2.0.0-SNAPSHOT + container_name: aas-env volumes: - ./aas-env.properties:/application/application.properties - ./aas:/application/aas @@ -50,6 +47,7 @@ services: aas-registry: image: eclipsebasyx/aas-registry-log-mongodb:2.0.0-SNAPSHOT + container_name: aas-registry ports: - 8082:8080 volumes: @@ -60,6 +58,7 @@ services: sm-registry: image: eclipsebasyx/submodel-registry-log-mongodb:2.0.0-SNAPSHOT + container_name: sm-registry ports: - 8083:8080 volumes: @@ -70,6 +69,7 @@ services: aas-discovery: image: eclipsebasyx/aas-discovery:2.0.0-SNAPSHOT + container_name: aas-discovery ports: - 8084:8081 volumes: @@ -78,9 +78,9 @@ services: mongo: condition: service_healthy - aas-web-ui_v2: + aas-web-ui: image: eclipsebasyx/aas-gui:SNAPSHOT - container_name: aas-web-ui_v2 + container_name: aas-web-ui ports: - "3000:3000" environment: diff --git a/examples/BaSyxQueryLanguage/docker-compose.yml b/examples/BaSyxQueryLanguage/docker-compose.yml index dfaaf6933..8694eedf7 100644 --- a/examples/BaSyxQueryLanguage/docker-compose.yml +++ b/examples/BaSyxQueryLanguage/docker-compose.yml @@ -65,7 +65,7 @@ services: mongo: condition: service_healthy mongo: - image: mongo:5.0.10 + image: mongo:8 container_name: mongo ports: - '27017:27017' @@ -74,10 +74,11 @@ services: MONGO_INITDB_ROOT_PASSWORD: mongoPassword restart: always healthcheck: - test: mongo + test: ["CMD-SHELL", "mongosh --quiet --username \"$MONGO_INITDB_ROOT_USERNAME\" --password \"$MONGO_INITDB_ROOT_PASSWORD\" --authenticationDatabase admin --eval \"db.adminCommand({ ping: 1 })\" || exit 1"] interval: 10s timeout: 5s - retries: 5 + start_period: 20s + retries: 10 aas-web-ui: image: eclipsebasyx/aas-gui:SNAPSHOT container_name: aas-ui