Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion basyx.aasregistry/docker-compose/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ services:
- basyx

mongodb:
image: mongo:5.0.10
image: mongo:8
container_name: mongodb
environment:
MONGO_INITDB_ROOT_USERNAME: admin
Expand Down
2 changes: 1 addition & 1 deletion basyx.submodelregistry/docker-compose/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 5 additions & 4 deletions ci/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 4 additions & 3 deletions ci/workflows/test-aas-discovery-mongodb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 4 additions & 3 deletions ci/workflows/test-aas-environment-mongodb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion ci/workflows/test-aas-registry-kafka-mongodb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ services:
- basyx

mongodb:
image: mongo:5.0.10
image: mongo:8
container_name: mongodb
environment:
MONGO_INITDB_ROOT_USERNAME: admin
Expand Down
2 changes: 1 addition & 1 deletion ci/workflows/test-aas-registry-log-mongodb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ services:
- basyx

mongodb:
image: mongo:5.0.10
image: mongo:8
container_name: mongodb
environment:
MONGO_INITDB_ROOT_USERNAME: admin
Expand Down
7 changes: 4 additions & 3 deletions ci/workflows/test-aas-repository-mongodb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 4 additions & 3 deletions ci/workflows/test-cd-repository-mongodb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion ci/workflows/test-submodel-registry-kafka-mongodb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ci/workflows/test-submodel-registry-log-mongodb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions ci/workflows/test-submodel-repository-mongodb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 5 additions & 4 deletions examples/BaSyxDynamicRBAC/docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
services:
mongo:
image: mongo:5.0.10
image: mongo:8
# Provide mongo config
restart: always
environment:
MONGO_INITDB_ROOT_USERNAME: mongoAdmin
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
Expand Down
26 changes: 13 additions & 13 deletions examples/BaSyxMinimal/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -70,6 +69,7 @@ services:

aas-discovery:
image: eclipsebasyx/aas-discovery:2.0.0-SNAPSHOT
container_name: aas-discovery
ports:
- 8084:8081
volumes:
Expand All @@ -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:
Expand Down
7 changes: 4 additions & 3 deletions examples/BaSyxQueryLanguage/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ services:
mongo:
condition: service_healthy
mongo:
image: mongo:5.0.10
image: mongo:8
container_name: mongo
ports:
- '27017:27017'
Expand All @@ -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
Expand Down