OZ-742: Pulled and rebased from upstream

.env

@@ -17,7 +17,7 @@ ENABLE_SSO=false
 
 # Bahmni EMR
 
-LOKI_URL=http://localhost:3100/loki/api/v1/push
+RUN_WITH_BAHMNI_EMR=false
 
 # Mail Config Properties Environment Variables
 MAIL_TRANSPORT_PROTOCOL=smtps

scripts/docker-compose-files.txt

@@ -4,6 +4,7 @@ docker-compose-odoo.yml
 docker-compose-odoo-sso.yml
 docker-compose-openmrs.yml
 docker-compose-openmrs-sso.yml
+docker-compose-bahmniemr.yml
 docker-compose-senaite.yml
 docker-compose-senaite-sso.yml
 docker-compose-backup.yml

scripts/utils.sh

@@ -69,13 +69,27 @@ function exportPaths () {
 function setDockerComposeCLIOptions () {
     # Parse 'docker-compose-files.txt' to get the list of Docker Compose files to run
     dockerComposeFiles=$(cat docker-compose-files.txt)
+
+    if [ "$RUN_WITH_BAHMNI_EMR" == "true" ]; then
+        export ENABLE_SSO=false
+    fi
+
     for file in ${dockerComposeFiles}
     do
         if [ "$ENABLE_SSO" != "true" ]; then
             if [[ "$file" == *"-sso.yml" || "$file" == "docker-compose-keycloak.yml" ]]; then
                 continue
             fi
         fi
+
+        if [[ "$file" == *"-bahmniemr.yml" && "$RUN_WITH_BAHMNI_EMR" == "false" ]]; then
+            continue
+        fi
+
+        if [[ "$file" == *"-openmrs.yml" && "$RUN_WITH_BAHMNI_EMR" == "true" ]]; then
+            continue
+        fi
+
         export dockerComposeFilesCLIOptions="$dockerComposeFilesCLIOptions -f ../$file"
     done