Skip to content

Owls 99654 - Expand the WDT custom folder from the archive before calling update or create domain #3110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions operator/src/main/resources/scripts/modelInImage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -894,6 +894,8 @@ function wdtCreatePrimordialDomain() {

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

expandWdtArchiveCustomDir

if [ -z "${OPSS_FLAGS}" ]; then

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

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

expandWdtArchiveCustomDir

${WDT_BINDIR}/updateDomain.sh ${wdtArgs} > ${WDT_OUTPUT} 2>&1
ret=$?

Expand Down Expand Up @@ -1378,3 +1382,14 @@ function wdtRotateAndCopyLogFile() {

cp ${WDT_ROOT}/logs/${logFileName} ${WDT_OUTPUT_DIR}/
}

# Function to expand the WDT custom folder from the archive before calling update or create domain.
function expandWdtArchiveCustomDir() {
cd ${DOMAIN_HOME} || exitOrLoop
for file in $(sort_files ${IMG_ARCHIVES_ROOTDIR} "*.zip")
do
${JAVA_HOME}/bin/jar xf ${IMG_ARCHIVES_ROOTDIR}/${file} wlsdeploy/custom
done

traceDirs before ${DOMAIN_HOME}/wlsdeploy/custom
}
1 change: 1 addition & 0 deletions operator/src/main/resources/scripts/utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ function traceEnv() {
INTROSPECT_HOME \
PATH \
TRACE_TIMING \
WLSDEPLOY_PROPERTIES \
OPERATOR_ENVVAR_NAMES
do
echo " ${env_var}='${!env_var}'"
Expand Down