Skip to content

Commit 0698b39

Browse files
committed
Merge branch 'fix-unzip-exploded-ear' into 'main'
fix unzipping exploded format omitted the dd due to regex. See merge request weblogic-cloud/weblogic-kubernetes-operator!4649 (cherry picked from commit b0c1690) b80a4fe fix unzipping exploded format omitted the dd due to regex. 3dedd58 remove unnecessary exclude.
1 parent 6d05edf commit 0698b39

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

operator/src/main/resources/scripts/introspectDomain.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1131,7 +1131,7 @@ def addDomainConfig(self):
11311131
"--exclude=$DOMAIN_HOME/config/wlsdeploy/custom " \
11321132
"--exclude=$DOMAIN_HOME/config/deployments " \
11331133
"--exclude=$DOMAIN_HOME/config/fmwconfig " \
1134-
"$DOMAIN_HOME/wlsdeploy/applications/*.xml " \
1134+
"$DOMAIN_HOME/wlsdeploy/applications/./*.xml " \
11351135
"$DOMAIN_HOME/config " \
11361136
"$DOMAIN_HOME/security/saml*.properties " \
11371137
"$DOMAIN_HOME/security/*.xml " % tar_name

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1330,7 +1330,7 @@ restoreAppAndLibs() {
13301330
# wlsdeploy/applications/*.xml since it is included int zipped up domain config
13311331
# zip, the original xml in the archive may have wdt tokenized notations.
13321332
cd ${DOMAIN_HOME} || return 1
1333-
unzip -o ${IMG_ARCHIVES_ROOTDIR}/${file} -x "wlsdeploy/domainBin/*" -x "wlsdeploy/domainLibraries/*" -x "wlsdeploy/applications/*.xml" -x "config/*"
1333+
unzip -o ${IMG_ARCHIVES_ROOTDIR}/${file} -x "wlsdeploy/domainBin/*" "wlsdeploy/domainLibraries/*" "config/*"
13341334
if [ $? -ne 0 ] ; then
13351335
trace SEVERE "Domain Source Type is FromModel, error in extracting application archive ${IMG_ARCHIVES_ROOTDIR}/${file}"
13361336
return 1

0 commit comments

Comments
 (0)