Fix merge conflicts

Author: markxnelson

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

@@ -27,7 +27,7 @@ The script will perform the following steps:
 * Create a directory for the generated properties and Kubernetes YAML files for this domain if it does not already exist.  The pathname is `/path/to/weblogic-operator-output-directory/weblogic-domains/<domainUID>`. If the directory already exists, its contents will be removed.
 * Create a properties file, `domain.properties`, in the directory that is created above. This properties file will be used to create a sample WebLogic Server domain.
 * Clone the weblogic docker-images project via the `git clone https://github.com/oracle/docker-images.git` into the current directory.
-* Replace the built-in username and password in the `properties/docker_build/domain_security.properties` file with the `username` and `password` that are supplied in the command line via the `-u` and `-p` options. These credentials need to match the WebLogic domain admin credentials in the secret that is specified via `weblogicCredentialsSecretName` property in the `create-domain-inputs.yaml` file.
+* Replace the built-in username and password in the `properties/docker-build/domain_security.properties` file with the `username` and `password` that are supplied in the command line via the `-u` and `-p` options. These credentials need to match the WebLogic domain admin credentials in the secret that is specified via `weblogicCredentialsSecretName` property in the `create-domain-inputs.yaml` file.
 * Build a Docker image based on the Docker sample, [Example Image with a WebLogic Server Domain using the Oracle WebLogic Deploy Tooling (WDT)](https://github.com/oracle/docker-images/tree/master/OracleWebLogic/samples/12213-domain-home-in-image-wdt) and [Example Image with a WebLogic Server Domain using WLST](https://github.com/oracle/docker-images/tree/master/OracleWebLogic/samples/12213-domain-home-in-image). It will create a sample WebLogic Server domain in the Docker image. Also, you can run the Docker sample, [Example Image with a WebLogic Server Domain](https://github.com/oracle/docker-images/tree/master/OracleWebLogic/samples/12213-domain-home-in-image), manually with the generated `domain.properties` to create a domain home image. **Note**: Oracle recommends keeping the domain home image private in the local repository.
 * Create a Kubernetes domain YAML file, `domain.yaml`, in the directory that is created above. This YAML file can be used to create the Kubernetes resource using the `kubectl create -f` or `kubectl apply -f` command.
 
@@ -77,7 +77,7 @@ The following parameters can be provided in the inputs file.
 | `domainUID` | Unique ID that will be used to identify this particular domain. Used as the name of the generated WebLogic domain as well as the name of the Kubernetes domain resource. This ID must be unique across all domains in a Kubernetes cluster. This ID cannot contain any character that is not valid in a Kubernetes service name. | `domain1` |
 | `exposeAdminNodePort` | Boolean indicating if the Administration Server is exposed outside of the Kubernetes cluster. | `false` |
 | `exposeAdminT3Channel` | Boolean indicating if the T3 administrative channel is exposed outside the Kubernetes cluster. | `false` |
-| `image` | WebLogic Docker image that the domain resource will use. If not specified, the value is the name of the generated Docker image. | `12213-domain-wdt` |
+| `image` | WebLogic Docker image that the domain resource will use. If not specified, the value is the name of the generated Docker image. | `12213-domain-home-in-image-wdt` |
 | `imagePath` | The relative directory of the WebLogic domain home in image Docker image in `https://github.com/oracle/docker-images.git` project under the `docker-images/OracleWebLogic/samples` directory.  | `12213-domain-home-in-image-wdt` |
 | `imagePullPolicy` | WebLogic Docker image pull policy. Legal values are "IfNotPresent", "Always", or "Never" | `IfNotPresent` |
 | `imagePullSecretName` | Name of the Kubernetes secret to access the Docker Store to pull the WebLogic Server Docker image. The presence of the secret will be validated when this parameter is specified |  |

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

@@ -43,8 +43,8 @@ productionModeEnabled: true
 # WebLogic Docker image that the domain resource will use. 
 # If not specified, the value is the name of the generated Docker image, which is
 #    "12213-domain-home-in-image" if the imagePath property is specified as "12213-domain-home-in-image";
-#    "12213-domain-wdt" if the imagePath property is specified as "12213-domain-home-in-image-wdt".
-image: 12213-domain-wdt 
+#    "12213-domain-home-in-image-wdt" if the imagePath property is specified as "12213-domain-home-in-image-wdt".
+image: 12213-domain-home-in-image-wdt
 
 # Image pull policy
 # Legal values are "IfNotPresent", "Always", or "Never"

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

@@ -153,7 +153,7 @@ function initialize {
 #
 function getDockerSample {
   rm -rf ${scriptDir}/docker-images
-  git clone https://github.com/oracle/docker-images.git
+  git clone https://github.com/oracle/docker-images.git ${scriptDir}/docker-images
 }
 
 #
@@ -174,11 +174,11 @@ function createFiles {
   enabledPrefix=""     # uncomment the feature
   disabledPrefix="# "  # comment out the feature
 
-  domainName=${domainUID}
+  domainName=${domainUID} 
 
   # Generate the properties file that will be used when creating the weblogic domain
   echo Generating ${domainPropertiesOutput}
-
+   
   cp ${domainPropertiesInput} ${domainPropertiesOutput}
   sed -i -e "s:%DOMAIN_NAME%:${domainName}:g" ${domainPropertiesOutput}
   sed -i -e "s:%ADMIN_PORT%:${adminPort}:g" ${domainPropertiesOutput}
@@ -235,25 +235,10 @@ function createFiles {
   sed -i -e "s:%WEBLOGIC_IMAGE_PULL_SECRET_NAME%:${imagePullSecretName}:g" ${dcrOutput}
   sed -i -e "s:%WEBLOGIC_IMAGE_PULL_SECRET_PREFIX%:${imagePullSecretPrefix}:g" ${dcrOutput}
 
-  # Remove any "...yaml-e" files left over from running sed
-  rm -f ${domainOutputDir}/*.yaml-e
-}
-
-#
-# Function to build docker image and create WebLogic domain home
-#
-function createDomainHome {
   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"
-  # 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"
-  fi
+  imageName="${imagePath}:latest"
 
   # now we know which image to use, update the domain yaml file
   if [ -z $image ]; then
@@ -262,40 +247,41 @@ function createDomainHome {
     sed -i -e "s|%IMAGE_NAME%|${image}|g" ${dcrOutput}
   fi
 
-  cd docker-images/OracleWebLogic/samples/${imagePath}
+  # Remove any "...yaml-e" files left over from running sed
+  rm -f ${domainOutputDir}/*.yaml-e
+}
 
-  # 12213-domain-home-in-image use one properties file for the credentials 
-  usernameFile="properties/docker_build/domain_security.properties"
-  passwordFile="properties/docker_build/domain_security.properties"
+#
+# Function to build docker image and create WebLogic domain home
+#
+function createDomainHome {
+  dockerDir=${scriptDir}/docker-images/OracleWebLogic/samples/${imagePath}
+  dockerPropsDir=${dockerDir}/properties
+  cp ${domainPropertiesOutput} ${dockerPropsDir}/docker-build
 
+  # 12213-domain-home-in-image use one properties file for the credentials 
+  usernameFile="${dockerPropsDir}/docker-build/domain_security.properties"
+  passwordFile="${dockerPropsDir}/docker-build/domain_security.properties"
+ 
   # 12213-domain-home-in-image-wdt uses two properties files for the credentials 
   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
+    usernameFile="${dockerPropsDir}/docker-build/adminuser.properties"
+    passwordFile="${dockerPropsDir}/docker-build/adminpass.properties"
   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
-    wget https://github.com/oracle/weblogic-deploy-tooling/releases/download/weblogic-deploy-tooling-0.14/weblogic-deploy.zip
-  fi
-
   if [ ! -z $baseImage ]; then
-    sed -i -e "s|\(FROM \).*|\1 ${baseImage}|g" Dockerfile
+    sed -i -e "s|\(FROM \).*|\1 ${baseImage}|g" ${dockerDir}/Dockerfile
   fi
 
-  sh ./build.sh
+  sh ${dockerDir}/build.sh
 
   if [ "$?" != "0" ]; then
     fail "Create domain ${domainName} failed."
   fi
 
-  cd -
   echo ""
   echo "Create domain ${domainName} successfully."
 }