From 7b8d2c08474d1b21aefed6117899354cd8a2dccc Mon Sep 17 00:00:00 2001
From: Kipchumba Bett <kipchubett@gmail.com>
Date: Fri, 15 Nov 2024 14:56:39 +0300
Subject: [PATCH] OZ-573: Move docker-compose-bundled-* to root level dir +
 some tweaks

---
 bundled-docker/openmrs/Dockerfile-sso                       | 6 +++---
 bundled-docker/pom.xml                                      | 5 +++++
 ....yml.template => docker-compose-bundled-sso.yml.template | 0
 ...dled.yml.template => docker-compose-bundled.yml.template | 0
 docker-compose-openmrs-sso.yml                              | 2 +-
 pom.xml                                                     | 2 ++
 scripts/utils.sh                                            | 2 +-
 7 files changed, 12 insertions(+), 5 deletions(-)
 rename bundled-docker/docker-compose-bundled-sso.yml.template => docker-compose-bundled-sso.yml.template (100%)
 rename bundled-docker/docker-compose-bundled.yml.template => docker-compose-bundled.yml.template (100%)

diff --git a/bundled-docker/openmrs/Dockerfile-sso b/bundled-docker/openmrs/Dockerfile-sso
index 98635a5..6773871 100644
--- a/bundled-docker/openmrs/Dockerfile-sso
+++ b/bundled-docker/openmrs/Dockerfile-sso
@@ -2,6 +2,6 @@ FROM openmrs/openmrs-reference-application-3-backend:3.1.1
 ADD binaries/openmrs/modules /openmrs/distribution/openmrs_modules
 ADD configs/openmrs/initializer_config /openmrs/distribution/openmrs_config
 ADD configs/openmrs/properties/fhirproxy.properties /openmrs/data/fhirproxy/config.properties
-ADD configs/openmrs_sso/properties/oauth2.properties /openmrs/data/oauth2.properties
-ADD configs/openmrs_sso/initializer_config/globalproperties/oauth2-login-props.xml /openmrs/distribution/openmrs_config/globalproperties/oauth2-login-props.xml
-ADD binaries/openmrs_sso/modules/* /openmrs/distribution/openmrs_modules
+ADD configs/openmrs/properties_sso/oauth2.properties /openmrs/data/oauth2.properties
+ADD configs/openmrs/initializer_config_sso/globalproperties/oauth2-login-props.xml /openmrs/distribution/openmrs_config/globalproperties/oauth2-login-props.xml
+ADD binaries/openmrs/modules_sso/* /openmrs/distribution/openmrs_modules
diff --git a/bundled-docker/pom.xml b/bundled-docker/pom.xml
index 5a0c016..e31d818 100644
--- a/bundled-docker/pom.xml
+++ b/bundled-docker/pom.xml
@@ -77,6 +77,11 @@
                                         <include>proxy/**</include>
                                         <include>senaite/**</include>
                                         <include>keycloak/**</include>
+                                    </includes>
+                                </resource>
+                                <resource>
+                                    <directory>../</directory>
+                                    <includes>
                                         <include>docker-compose-bundled.yml.template</include>
                                         <include>docker-compose-bundled-sso.yml.template</include>
                                     </includes>
diff --git a/bundled-docker/docker-compose-bundled-sso.yml.template b/docker-compose-bundled-sso.yml.template
similarity index 100%
rename from bundled-docker/docker-compose-bundled-sso.yml.template
rename to docker-compose-bundled-sso.yml.template
diff --git a/bundled-docker/docker-compose-bundled.yml.template b/docker-compose-bundled.yml.template
similarity index 100%
rename from bundled-docker/docker-compose-bundled.yml.template
rename to docker-compose-bundled.yml.template
diff --git a/docker-compose-openmrs-sso.yml b/docker-compose-openmrs-sso.yml
index e01a295..c055f97 100644
--- a/docker-compose-openmrs-sso.yml
+++ b/docker-compose-openmrs-sso.yml
@@ -13,7 +13,7 @@ services:
     environment:
       - SPA_CONFIG_URLS=${SPA_CONFIG_URLS},/openmrs/spa/configs/ozone-sso-frontend-config.json
     volumes:
-      - "${OPENMRS_SSO_FRONTEND_CONFIG_PATH}/*:/usr/share/nginx/html/configs/"
+      - "${OPENMRS_SSO_FRONTEND_CONFIG_PATH}ozone-sso-frontend-config.json:/usr/share/nginx/html/configs/ozone-sso-frontend-config.json"
 
   env-substitution:
     environment:
diff --git a/pom.xml b/pom.xml
index b40f3e0..a922051 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,6 +86,8 @@
                   </includes>
                   <excludes>
                     <exclude>scripts/distro/</exclude>
+                    <excude>docker-compose-bundled.yml.template</excude>
+                    <excude>docker-compose-bundled-sso.yml.template</excude>
                   </excludes>
                 </resource>
               </resources>
diff --git a/scripts/utils.sh b/scripts/utils.sh
index 4cdfe8a..c97807e 100644
--- a/scripts/utils.sh
+++ b/scripts/utils.sh
@@ -243,6 +243,6 @@ function displayAccessURLsWithCredentials {
         echo ""
         echo "$INFO 🔗 Access each ${OZONE_LABEL:-Ozone FOSS} components at the following URL:"
         echo ""
-        awk -F, 'NR==1 {printf "%-15s %-40s %-15s %-15s\n", $1, $2, $3, $4} NR>2' .urls_2.txt
+        awk -F, 'NR==1 {printf "%-15s %-40s %-15s %-15s\n", $1, $2, $3, $4} NR>2 && $1 != "Keycloak" {printf "%-15s %-40s %-15s %-15s\n", $1, $2, $3, $4}' .urls_2.txt
     fi
 }