merge version number updates from 2.0-rc1

Author: markxnelson

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

@@ -6,6 +6,7 @@ The sample scripts demonstrate the creation of a WebLogic domain home in a Docke
 
 The following prerequisites must be handled prior to running the create domain script:
 * Make sure the WebLogic operator is running.
+* The operator requires WebLogic Server 12.2.1.3.0 with patch 28076014 applied. Refer to [Weblogic docker images](../../../../../site/weblogic-docker-images.md) for details on how to create one.
 * Create a Kubernetes namespace for the domain unless the intention is to use the default namespace.
 * Create the Kubernetes secrets `username` and `password` of the admin account in the same Kubernetes namespace as the domain.
 * Build the Oracle WebLogic image `oracle/weblogic:12.2.1.3-developer`. Refer to [Oracle WebLogic Server on Docker](https://github.com/oracle/docker-images/tree/master/OracleWebLogic/dockerfiles/12.2.1.3). If a different `baseImage` (see Configuration table below) is specified, the specified image needs to be built locally or pulled from a repository.

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

@@ -40,11 +40,9 @@ managedServerPort: 8001
 # Boolean indicating if production mode is enabled for the domain
 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-home-in-image-wdt" if the imagePath property is specified as "12213-domain-home-in-image-wdt".
-image: 12213-domain-home-in-image-wdt 
+# WebLogic Docker image.
+# The operator requires WebLogic Server 12.2.1.3.0 with patch 28076014 applied. See README.md for more help.
+#image:
 
 # Image pull policy
 # Legal values are "IfNotPresent", "Always", or "Never"

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

@@ -174,11 +174,15 @@ function createFiles {
   enabledPrefix=""     # uncomment the feature
   disabledPrefix="# "  # comment out the feature
 
-  domainName=${domainUID} 
+  if [ -z "${image}" ]; then
+    fail "Please specify image in your input YAML"
+  fi
+
+  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}
@@ -258,7 +262,7 @@ 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"

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

@@ -8,6 +8,7 @@ Before you begin, read this guide, [Domain Resource](../../../../../site/domain-
 
 The following prerequisites must be handled prior to running the create domain script:
 * Make sure the WebLogic operator is running.
+* The operator requires WebLogic Server 12.2.1.3.0 with patch 28076014 applied. Refer to [Weblogic docker images](../../../../../site/weblogic-docker-images.md) for details on how to create one.
 * Create a Kubernetes namespace for the domain unless the intention is to use the default namespace.
 * In the same Kubernetes namespace, create the Kubernetes persistent volume where the domain home will be hosted, and the Kubernetes persistent volume claim for the domain. For samples to create a PV and PVC, see [Create sample PV and PVC](../../create-weblogic-domain-pv-pvc/README.md).
 * Create the Kubernetes secrets `username` and `password` of the admin account in the same Kubernetes namespace as the domain.

kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/create-domain-inputs.yaml

@@ -41,8 +41,9 @@ managedServerNameBase: managed-server
 # Port number for each managed server
 managedServerPort: 8001
 
-# WebLogic Docker image
-image: store/oracle/weblogic:12.2.1.3
+# WebLogic Docker image.
+# The operator requires WebLogic Server 12.2.1.3.0 with patch 28076014 applied. See README.md for more help.
+#image:
 
 # Image pull policy
 # Legal values are "IfNotPresent", "Always", or "Never"

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

@@ -162,6 +162,10 @@ function createFiles {
   enabledPrefix=""     # uncomment the feature
   disabledPrefix="# "  # comment out the feature
 
+  if [ -z "${image}" ]; then
+    fail "Please specify image in your input YAML"
+  fi
+
   domainName=${domainUID}
 
   # Use the default value if not defined.

site/weblogic-docker-images.md

@@ -28,7 +28,7 @@ Oracle provides a [WebLogic Server 12.2.1.3.0 Docker image](https://store.docker
 must have a Docker Store account, log on to the Docker Store, navigate 
 to that image and click on the "Proceed to Checkout" button which will 
 prompt you to read and accept the license agreement for the image. 
-Once you have accepted the license agreement, you will be abel to 
+Once you have accepted the license agreement, you will be able to 
 pull the image using your Docker store credentials. 
 
 First, you will need to login to the Docker Store: