Skip to content

Commit 1050ea7

Browse files
authored
OWLS-99654 - Expand the WDT custom folder from the archive in the domain dir before calling update or create domain. (#3110)
1 parent 5dd6541 commit 1050ea7

File tree

2 files changed

+16
-0
lines changed

2 files changed

+16
-0
lines changed

operator/src/main/resources/scripts/modelInImage.sh

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -894,6 +894,8 @@ function wdtCreatePrimordialDomain() {
894894

895895
trace "About to call '${WDT_BINDIR}/createDomain.sh ${wdtArgs}'."
896896

897+
expandWdtArchiveCustomDir
898+
897899
if [ -z "${OPSS_FLAGS}" ]; then
898900

899901
# We get here for WLS domains, and for the JRF 'first time' case
@@ -983,6 +985,8 @@ function wdtUpdateModelDomain() {
983985

984986
trace "About to call '${WDT_BINDIR}/updateDomain.sh ${wdtArgs}'."
985987

988+
expandWdtArchiveCustomDir
989+
986990
${WDT_BINDIR}/updateDomain.sh ${wdtArgs} > ${WDT_OUTPUT} 2>&1
987991
ret=$?
988992

@@ -1378,3 +1382,14 @@ function wdtRotateAndCopyLogFile() {
13781382

13791383
cp ${WDT_ROOT}/logs/${logFileName} ${WDT_OUTPUT_DIR}/
13801384
}
1385+
1386+
# Function to expand the WDT custom folder from the archive before calling update or create domain.
1387+
function expandWdtArchiveCustomDir() {
1388+
cd ${DOMAIN_HOME} || exitOrLoop
1389+
for file in $(sort_files ${IMG_ARCHIVES_ROOTDIR} "*.zip")
1390+
do
1391+
${JAVA_HOME}/bin/jar xf ${IMG_ARCHIVES_ROOTDIR}/${file} wlsdeploy/custom
1392+
done
1393+
1394+
traceDirs before ${DOMAIN_HOME}/wlsdeploy/custom
1395+
}

operator/src/main/resources/scripts/utils.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ function traceEnv() {
101101
INTROSPECT_HOME \
102102
PATH \
103103
TRACE_TIMING \
104+
WLSDEPLOY_PROPERTIES \
104105
OPERATOR_ENVVAR_NAMES
105106
do
106107
echo " ${env_var}='${!env_var}'"

0 commit comments

Comments
 (0)