Address another review comment

Signed-off-by: doxiao <[email protected]>

Author: doxiao

kubernetes/samples/scripts/common/utility.sh

@@ -281,12 +281,6 @@ function createFiles {
       domainHomeImageBuildPath="./docker-images/OracleWebLogic/samples/12213-domain-home-in-image"
     fi
 
-    # calculate the internal name to tag the generated image
-    defaultImageName="`basename ${domainHomeImageBuildPath} | sed 's/^[0-9]*-//'`"
-    baseTag=${domainHomeImageBase#*:}
-   
-    defaultImageName=${defaultImageName}:${baseTag:-"latest"}
-
     # Generate the properties file that will be used when creating the weblogic domain
     echo Generating ${domainPropertiesOutput}
 
@@ -303,8 +297,16 @@ function createFiles {
     sed -i -e "s:%JAVA_OPTIONS%:${javaOptions}:g" ${domainPropertiesOutput}
     sed -i -e "s:%T3_CHANNEL_PORT%:${t3ChannelPort}:g" ${domainPropertiesOutput}
     sed -i -e "s:%T3_PUBLIC_ADDRESS%:${t3PublicAddress}:g" ${domainPropertiesOutput}
-    sed -i -e "s|%IMAGE_NAME%|${defaultImageName}|g" ${domainPropertiesOutput}
 
+    if [ -z "${image}" ]; then
+      # calculate the internal name to tag the generated image
+      defaultImageName="`basename ${domainHomeImageBuildPath} | sed 's/^[0-9]*-//'`"
+      baseTag=${domainHomeImageBase#*:}
+      defaultImageName=${defaultImageName}:${baseTag:-"latest"}
+      sed -i -e "s|%IMAGE_NAME%|${defaultImageName}|g" ${domainPropertiesOutput}
+    else 
+      sed -i -e "s|%IMAGE_NAME%|${image}|g" ${domainPropertiesOutput}
+    fi
   else
 
     createJobOutput="${domainOutputDir}/create-domain-job.yaml"

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

@@ -196,11 +196,6 @@ function createDomainHome {
 
   sh ${dockerDir}/build.sh
 
-  # if the "image" property is set, tag the image with it too
-  if [ ! -z $image ]; then
-    docker tag $defaultImageName $image
-  fi
-
   if [ "$?" != "0" ]; then
     fail "Create domain ${domainName} failed."
   fi

kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/README.md

@@ -114,6 +114,7 @@ Note that the example results below use the `default` Kubernetes namespace. If y
 
 The content of the generated `domain.yaml`:
 
+```
 # Copyright 2017, 2019, Oracle Corporation and/or its affiliates. All rights reserved.
 
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.