Add an option to not alway clone the docker images project plus bug-fixing (#656)

* Add an option to save previous cloned project dir and fix a problem with image setting

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

* Update README plus minor modification

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

* Change -s to -k

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

Author: doxiao

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

@@ -37,12 +37,14 @@ The usage of the create script is as follows:
 
 ```
 $ sh create-domain.sh -h
-usage: create-domain.sh -o dir -i file -u username -p password [-e] [-h]
+usage: create-domain.sh -o dir -i file -u username -p password [-s] [-e] [-h]
   -i Parameter inputs file, must be specified.
   -o Ouput directory for the generated properties and YAML files, must be specified.
   -u Username used in building the Docker image for WebLogic domain in image.
   -p Password used in building the Docker image for WebLogic domain in image.
   -e Also create the resources in the generated YAML files, optional.
+  -k Keep what has been previously cloned from https://github.com/oracle/docker-images.git, optional. 
+     If not specified, this script will always remove existing project and clone again.
   -h Help
 
 ```

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

@@ -20,12 +20,14 @@ source ${scriptDir}/../../common/utility.sh
 source ${scriptDir}/../../common/validate.sh
 
 function usage {
-  echo usage: ${script} -o dir -i file -u username -p password [-e] [-h]
+  echo usage: ${script} -o dir -i file -u username -p password [-k] [-e] [-h]
   echo "  -i Parameter inputs file, must be specified."
   echo "  -o Ouput directory for the generated properties and YAML files, must be specified."
   echo "  -u Username used in building the Docker image for WebLogic domain in image."
   echo "  -p Password used in building the Docker image for WebLogic domain in image."
   echo "  -e Also create the resources in the generated YAML files, optional."
+  echo "  -k Keep what has been previously from cloned https://github.com/oracle/docker-images.git, optional. "
+  echo "     If not specified, this script will always remove existing project directory and clone again."
   echo "  -h Help"
   exit $1
 }
@@ -34,7 +36,8 @@ function usage {
 # Parse the command line options
 #
 executeIt=false
-while getopts "evhi:o:u:p:" opt; do
+cloneIt=true
+while getopts "evhki:o:u:p:" opt; do
   case $opt in
     i) valuesInputFile="${OPTARG}"
     ;;
@@ -46,6 +49,8 @@ while getopts "evhi:o:u:p:" opt; do
     ;;
     p) password="${OPTARG}"
     ;;
+    k) cloneIt=false;
+    ;;
     h) usage 0
     ;;
     *) usage 1
@@ -138,14 +143,16 @@ function initialize {
 
   initOutputDir
 
-  getDockerSample
+  if [ "${cloneIt}" = true ]; then
+    getDockerSample
+  fi
 }
 
 #
 # Function to get the dependency docker sample
 #
 function getDockerSample {
-  rm -rf {scriptDir}/docker-images
+  rm -rf ${scriptDir}/docker-images
   git clone https://github.com/oracle/docker-images.git
 }
 
@@ -232,12 +239,21 @@ function createFiles {
 # Function to build docker image and create WebLogic domain home
 #
 function createDomainHome {
-  cp ${domainPropertiesOutput} ./docker-images/OracleWebLogic/samples/12213-domain-home-in-image/properties/docker_build
-
   if [ -z $imagePath ]; then
     imagePath="12213-domain-home-in-image-wdt"
   fi
 
+  cp ${domainPropertiesOutput} ./docker-images/OracleWebLogic/samples/${imagePath}/properties/docker_build
+
+  imageName="12213-domain-home-in-image:latest"
+  # use the existence of build-archive.sh file to determine if we need to download WDT
+  if [ -f "./docker-images/OracleWebLogic/samples/${imagePath}/build-archive.sh" ]; then
+    imageName="12213-domain-wdt:latest"
+  fi
+
+  # now we know which image to use, update the domain yaml file
+  sed -i -e "s|%IMAGE_NAME%|${imageName}|g" ${dcrOutput}
+
   cd docker-images/OracleWebLogic/samples/${imagePath}
 
   # 12213-domain-home-in-image use one properties file for the credentials 
@@ -248,11 +264,13 @@ function createDomainHome {
   if [ ! -f $usernameFile ]; then
     usernameFile="properties/docker-build/adminuser.properties"
     passwordFile="properties/docker-build/adminpass.properties"
+    sed -i -e "s|weblogic|${username}|g" $usernameFile
+    sed -i -e "s|welcome1|${password}|g" $passwordFile
+  else
+    sed -i -e "s|myuser|${username}|g" $usernameFile
+    sed -i -e "s|mypassword1|${password}|g" $passwordFile
   fi
 
-  sed -i -e "s|myuser|${username}|g" $usernameFile
-  sed -i -e "s|mypassword1|${password}|g" $passwordFile
-
   # use the existence of build-archive.sh file to determine if we need to download WDT
   if [ -f "build-archive.sh" ]; then
     sh ./build-archive.sh

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

@@ -17,7 +17,7 @@ spec:
   # If the domain home is in the image
   domainHomeInImage: true
   # The Operator currently does not support other images
-  image: "12213-domain-home-in-image:latest"
+  image: %IMAGE_NAME%
   # imagePullPolicy defaults to "Never"
   imagePullPolicy: "Never"
   # Identify which Secret contains the WebLogic Admin credentials (note that there is an example of
@@ -26,9 +26,9 @@ spec:
     name: %WEBLOGIC_CREDENTIALS_SECRET_NAME%
   # Whether to include the server out file into the pod's stdout, default is true
   includeServerOutInPodLog: %INCLUDE_SERVER_OUT_IN_POD_LOG%
-  # serverStartPolicy legal values are "NEVER", "ALWAYS", "IF_NEEDED", or "ADMIN_ONLY"
+  # serverStartPolicy legal values are "NEVER", "IF_NEEDED", or "ADMIN_ONLY"
   # This determines which WebLogic Servers the Operator will start up when it discovers this Domain
-  # - "ALWAYS" will start up all defined servers
+  # - "NEVER" will not start any servers in the domain 
   # - "ADMIN_ONLY" will start up only the administration server (no managed servers will be started)
   # - "IF_NEEDED" will start all non-clustered servers, including the administration server and clustered servers up to the replica count
   serverStartPolicy: "%SERVER_START_POLICY%"
@@ -58,3 +58,4 @@ spec:
       replicas: %INITIAL_MANAGED_SERVER_REPLICAS%
   # The number of managed servers to start from clusters not listed in clusters
   # replicas: 1
+