Merge branch 'opatch-log-stdout' into 'main'

print the OPatch log to stdout on patching failure to help user determine the cause See merge request weblogic-cloud/weblogic-image-tool!462
oracle · Dec 7, 2023 · 1f30dd2 · 1f30dd2
2 parents 172dc2a + 389bfa0
commit 1f30dd2
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/imagetool/src/main/resources/docker-files/fmw-patching.mustache b/imagetool/src/main/resources/docker-files/fmw-patching.mustache
@@ -19,7 +19,8 @@
         # Apply all patches provided at the same time
         RUN {{{oracle_home}}}/OPatch/opatch napply -silent -oh {{{oracle_home}}} -nonrollbackable -phBaseDir {{{tempDir}}}/patches \
         && test $? -eq 0 \
-        && {{{oracle_home}}}/OPatch/opatch util cleanup -silent -oh {{{oracle_home}}}
+        && {{{oracle_home}}}/OPatch/opatch util cleanup -silent -oh {{{oracle_home}}} \
+        || (cat {{{oracle_home}}}/cfgtoollogs/opatch/opatch*.log && exit 1)
     {{/strictPatchOrdering}}
     {{#strictPatchOrdering}}
         # Apply one patch at a time in the order they were specified