Skip to content

Commit 13f181d

Browse files
committed
Move some generate domain resource file code from function createDomainHome to createFiles
1 parent 528599d commit 13f181d

File tree

1 file changed

+9
-9
lines changed
  • kubernetes/samples/scripts/create-weblogic-domain/domain-home-in-image

1 file changed

+9
-9
lines changed

kubernetes/samples/scripts/create-weblogic-domain/domain-home-in-image/create-domain.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -235,14 +235,6 @@ function createFiles {
235235
sed -i -e "s:%WEBLOGIC_IMAGE_PULL_SECRET_NAME%:${imagePullSecretName}:g" ${dcrOutput}
236236
sed -i -e "s:%WEBLOGIC_IMAGE_PULL_SECRET_PREFIX%:${imagePullSecretPrefix}:g" ${dcrOutput}
237237

238-
# Remove any "...yaml-e" files left over from running sed
239-
rm -f ${domainOutputDir}/*.yaml-e
240-
}
241-
242-
#
243-
# Function to build docker image and create WebLogic domain home
244-
#
245-
function createDomainHome {
246238
if [ -z $imagePath ]; then
247239
imagePath="12213-domain-home-in-image-wdt"
248240
fi
@@ -254,7 +246,15 @@ function createDomainHome {
254246
else
255247
sed -i -e "s|%IMAGE_NAME%|${image}|g" ${dcrOutput}
256248
fi
257-
249+
250+
# Remove any "...yaml-e" files left over from running sed
251+
rm -f ${domainOutputDir}/*.yaml-e
252+
}
253+
254+
#
255+
# Function to build docker image and create WebLogic domain home
256+
#
257+
function createDomainHome {
258258
dockerDir=${scriptDir}/docker-images/OracleWebLogic/samples/${imagePath}
259259
dockerPropsDir=${dockerDir}/properties
260260
cp ${domainPropertiesOutput} ${dockerPropsDir}/docker-build

0 commit comments

Comments
 (0)