From 29d1ed3cd4617ddd857763048c8f367e60595917 Mon Sep 17 00:00:00 2001
From: Adam Saghy <adamsaghy@gmail.com>
Date: Mon, 23 Jun 2025 18:21:16 +0200
Subject: [PATCH] FINERACT-2181: JIB docker build requires resources files to
 be merged with classes

---
 fineract-provider/build.gradle | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle
index c13a1865d..d5b885cc3 100644
--- a/fineract-provider/build.gradle
+++ b/fineract-provider/build.gradle
@@ -241,6 +241,30 @@ bootJar {
     dependsOn resolve
 }
 
+// Task to copy files from resources/main to the compiled output directory
+tasks.register('injectDefaultResources', Copy) {
+    dependsOn bootJar, jar
+    from layout.buildDirectory.dir("resources/main")
+    into "$buildDir/classes/java/main"
+}
+tasks.injectDefaultResources.dependsOn(bootJar)
+
+// Ensure this runs before the Jib build
+tasks.named("jib").configure {
+    dependsOn injectDefaultResources
+    finalizedBy removeMergedClasses
+}
+
+tasks.named("jibDockerBuild").configure {
+    dependsOn injectDefaultResources
+    finalizedBy removeMergedClasses
+}
+
+// Task to delete files from the merged output directory
+tasks.register('removeMergedClasses', Delete) {
+    delete layout.buildDirectory.dir("classes/java/main")
+}
+
 jib {
     from {
         image = 'azul/zulu-openjdk-alpine:21'
@@ -275,15 +299,6 @@ jib {
         user = 'nobody:nogroup'
     }
 
-    extraDirectories {
-        paths {
-            path {
-                from = layout.buildDirectory.dir("resources/main").get().asFile
-                into = '/app/classes'
-            }
-        }
-    }
-
     allowInsecureRegistries = true
 
     dependencies {