Rename imageName to defaultImageName and set default domainHomeImageBase to the patched 12.2.1.3 image

Signed-off-by: doxiao <dongbo.xiao@oracle.com>

Author: doxiao

kubernetes/samples/scripts/common/utility.sh

@@ -282,10 +282,10 @@ function createFiles {
  fi
 
  # calculate the internal name to tag the generated image
- imageName="`basename ${domainHomeImageBuildPath} | sed 's/^[0-9]*-//'`"
+ defaultImageName="`basename ${domainHomeImageBuildPath} | sed 's/^[0-9]*-//'`"
  baseTag=${domainHomeImageBase#*:}
 
- imageName=${imageName}:${baseTag:-"latest"}
+ defaultImageName=${defaultImageName}:${baseTag:-"latest"}
 
  # Generate the properties file that will be used when creating the weblogic domain
  echo Generating ${domainPropertiesOutput}
@@ -303,7 +303,7 @@ 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%|${imageName}|g" ${domainPropertiesOutput}
+ sed -i -e "s|%IMAGE_NAME%|${defaultImageName}|g" ${domainPropertiesOutput}
 
  else
 
@@ -415,7 +415,7 @@ function createFiles {
 
  # now we know which image to use, update the domain yaml file
  if [ -z $image ]; then
- sed -i -e "s|%WEBLOGIC_IMAGE%|${imageName}|g" ${dcrOutput}
+ sed -i -e "s|%WEBLOGIC_IMAGE%|${defaultImageName}|g" ${dcrOutput}
  else
  sed -i -e "s|%WEBLOGIC_IMAGE%|${image}|g" ${dcrOutput}
  fi

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

@@ -125,7 +125,7 @@ domainPVMountPath: /shared
 # Refer to [WebLogic Docker images](../../../../../site/weblogic-docker-images.md) for details on how
 # to obtain or create the image.
 # See README.md for more help.
-#domainHomeImageBase:
+#domainHomeImageBase: store/oracle/weblogic:12.2.1.3
 
 # Location of the WebLogic "domain home in image" Docker image sample in the
 # `https://github.com/oracle/docker-images.git` project.

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

@@ -165,7 +165,7 @@ function initialize {
 #
 function getDockerSample {
  rm -rf ${scriptDir}/docker-images
- git clone https://github.com/mriccell/docker-images.git ${scriptDir}/docker-images
+ git clone https://github.com/oracle/docker-images.git ${scriptDir}/docker-images
 }
 
 #
@@ -194,8 +194,10 @@ function createDomainHome {
  fi
 
  sh ${dockerDir}/build.sh
+
+ # if the "image" property is set, tag the image as it too
  if [ ! -z $image ]; then
- docker tag $imageName $image
+ docker tag $defaultImageName $image
  fi
 
  if [ "$?" != "0" ]; then