merge upstream

This commit is contained in:
2026-03-16 17:41:11 +01:00
+2 -1
View File
@@ -201,6 +201,7 @@ services:
- /opt/webcontent/opticswiki/working:/usr/local/apache2/wiki/working
- /opt/webcontent/opticswiki/lib:/usr/local/apache2/wiki/lib
- /opt/webcontent/opticswiki/conf:/usr/local/apache2/conf
- /opt/webcontent/opticswiki/htdocs:/usr/local/apache2/htdocs
- /opt/webcontent/opticswiki/log:/var/log/apache2
networks:
- backend
@@ -473,7 +474,7 @@ services:
environment:
MONGO_URI: mongodb://up-mavt-suite-mongo:27017/elicitation
FLASK_ENV: development
ADMIN_PASSWORD: ${ADMIN_PASSWORD}
ADMIN_PASSWORD: ${MCDA_UP_ADMIN_PASSWORD}
depends_on:
- up-mavt-suite-mongo
networks: