Merge pull request #810 from oracle/updateImage

update patched image info

Author: rjeberhard

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

@@ -11,7 +11,7 @@ adminPort: 7001
 adminServerName: admin-server
 
 # Unique ID identifying a domain.
-# This ID must not contain an underscope ("_"), and must be lowercase and unique across all domains 
+# This ID must not contain an underscope ("_"), and must be lowercase and unique across all domains
 # in a Kubernetes cluster.
 domainUID: domain1
 
@@ -52,7 +52,7 @@ productionModeEnabled: true
 # to be used in a registry local to that Kubernetes cluster. You also need to push the `image` to
 # that registry before starting the domain using the `kubectl create -f` or `kubectl apply -f` command.
 # See README.md for more help.
-#image: 
+#image:
 
 # Image pull policy
 # Legal values are "IfNotPresent", "Always", or "Never"
@@ -63,7 +63,7 @@ imagePullPolicy: IfNotPresent
 #imagePullSecretName:
 
 # Name of the Kubernetes secret for the Admin Server's username and password
-# The name must be lowercase. 
+# The name must be lowercase.
 # If not specified, the value is derived from the domainUID as <domainUID>-weblogic-credentials
 weblogicCredentialsSecretName: domain1-weblogic-credentials
 
@@ -107,25 +107,27 @@ namespace: default
 # Java Option for WebLogic Server
 javaOptions: -Dweblogic.StdoutDebugEnabled=false
 
-# Name of the persistent volume claim 
+# Name of the persistent volume claim
 # If not specified, the value is derived from the domainUID as <domainUID>-weblogic-sample-pvc
 # This parameter is required if 'logHomeOnPV' is true.
 # Otherwise, it is ignored.
 persistentVolumeClaimName: domain1-weblogic-sample-pvc
 
-# Mount path of the domain persistent volume. 
+# Mount path of the domain persistent volume.
 # This parameter is required if 'logHomeOnPV' is true.
 # Otherwise, it is ignored.
 domainPVMountPath: /shared
 
 # Base WebLogic binary image used to build the WebLogic domain image
 # The operator requires WebLogic Server 12.2.1.3.0 with patch 29135930 applied.
+# The existing WebLogic Docker image, `store/oracle/weblogic:12.2.1.3`, was updated on January 17, 2019,
+# and has all the necessary patches applied; a `docker pull` is required if you already have this image.
 # Refer to [WebLogic Docker images](../../../../../site/weblogic-docker-images.md) for details on how
-# to create a custom Docker image with the required patch.
+# to obtain or create the image.
 # See README.md for more help.
-#domainHomeImageBase: 
+#domainHomeImageBase:
 
-# Location of the WebLogic "domain home in image" Docker image sample in the 
+# Location of the WebLogic "domain home in image" Docker image sample in the
 # `https://github.com/oracle/docker-images.git` project.
 # If not specified, use "./docker-images/OracleWebLogic/samples/12213-domain-home-in-image".
 # Another possible value is "./docker-images/OracleWebLogic/samples/12213-domain-home-in-image-wdt",

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

@@ -39,8 +39,10 @@ managedServerPort: 8001
 
 # WebLogic Server Docker image.
 # The operator requires WebLogic Server 12.2.1.3.0 with patch 29135930 applied.
+# The existing WebLogic Docker image, `store/oracle/weblogic:12.2.1.3`, was updated on January 17, 2019,
+# and has all the necessary patches applied; a `docker pull` is required if you already have this image.
 # Refer to [WebLogic Docker images](../../../../../site/weblogic-docker-images.md) for details on how
-# to create a custom Docker image with the required patch.
+# to obtain or create the image.
 #image:
 
 # Image pull policy
@@ -55,11 +57,11 @@ imagePullPolicy: IfNotPresent
 productionModeEnabled: true
 
 # Name of the Kubernetes secret for the Admin Server's username and password
-# The name must be lowercase. 
+# The name must be lowercase.
 # If not specified, the value is derived from the domainUID as <domainUID>-weblogic-credentials
 weblogicCredentialsSecretName: domain1-weblogic-credentials
 
-# Whether to include server .out to the pod's stdout. 
+# Whether to include server .out to the pod's stdout.
 # The default is true.
 includeServerOutInPodLog: true
 
@@ -91,11 +93,11 @@ namespace: default
 #Java Option for WebLogic Server
 javaOptions: -Dweblogic.StdoutDebugEnabled=false
 
-# Name of the persistent volume claim 
+# Name of the persistent volume claim
 # If not specified, the value is derived from the domainUID as <domainUID>-weblogic-sample-pvc
-persistentVolumeClaimName: domain1-weblogic-sample-pvc 
+persistentVolumeClaimName: domain1-weblogic-sample-pvc
 
-# Mount path of the domain persistent volume. 
+# Mount path of the domain persistent volume.
 domainPVMountPath: /shared
 
 # Mount path where the create domain scripts are located inside a pod
@@ -112,7 +114,7 @@ createDomainScriptsMountPath: /u01/weblogic
 # domain home. The script is located in the in-pod directory that is specified in the
 # `createDomainScriptsMountPath` property.
 #
-# If you need to provide your own scripts to create the domain home, instead of using the 
+# If you need to provide your own scripts to create the domain home, instead of using the
 # built-it scripts, you must use this property to set the name of the script that you want
 # the create domain job to run.
 createDomainScriptName: create-domain-job.sh
@@ -124,7 +126,7 @@ createDomainScriptName: create-domain-job.sh
 # use the built-in WLST offline scripts in the `wlst` directory to create the WebLogic domain.
 # It can also be set to the relative path `wdt`, and then the built-in WDT scripts will be
 # used instead.
-# 
+#
 # An absolute path is also supported to point to an arbitrary directory in the file system.
 #
 # The built-in scripts can be replaced by the user-provided scripts or model files as long

site/quickstart.md

@@ -42,15 +42,13 @@ d.	Pull the Traefik load balancer image:
 $ docker pull traefik:1.7.4
 ```
 e.	Pull the WebLogic 12.2.1.3 install image:
+
 ```
 $ docker pull store/oracle/weblogic:12.2.1.3
-```
-f.	Then patch the WebLogic image according to the instructions [here](https://github.com/oracle/docker-images/tree/master/OracleWebLogic/samples/12213-patch-wls-for-k8s), with these modifications:
+```  
+**Note**: The existing WebLogic Docker image, `store/oracle/weblogic:12.2.1.3`, was updated on January 17, 2019, and has all the necessary patches applied; a `docker pull` is required if you already have this image.
 
-* Change the `FROM` clause to extend the `store/oracle/weblogic:12.2.1.3` image from `Dockerfile.patch-ontop-12213`.
-* Comment out commands that apply patch 27117282.   
-
-g. Copy the image to all the nodes in your cluster, or put it in a Docker registry that your cluster can access.
+f. Copy the image to all the nodes in your cluster, or put it in a Docker registry that your cluster can access.
 
 ## 2. Grant the Helm service account the `cluster-admin` role.
 
@@ -162,12 +160,14 @@ Follow the directions in the [README](../kubernetes/samples/scripts/create-weblo
 including:
 
 * Copying the sample `kubernetes/samples/scripts/create-weblogic-domain/domain-home-in-image/create-domain-inputs.yaml` file and updating your copy with the `domainUID` (`sample-domain1`),
-domain namespace (`sample-domain1-ns`), and the `domainHomeImageBase` (`oracle/weblogic:12213-patch-wls-for-k8s`).
+domain namespace (`sample-domain1-ns`), and the `domainHomeImageBase` (`store/oracle/weblogic:12.2.1.3`).
 
 * Setting `weblogicCredentialsSecretName` to the name of the secret containing the WebLogic credentials, in this case, `sample-domain1-weblogic-credentials`.
 
 * Leaving the `image` empty unless you need to tag the new image that the script builds to a different name.
 
+**NOTE**: If you set the `domainHomeImageBuildPath` property to `./docker-images/OracleWebLogic/samples/12213-domain-home-in-image-wdt`, make sure that your `JAVA_HOME` is set to a Java JDK version 1.8 or later.
+
 For example, assuming you named your copy `my-inputs.yaml`:
 ```
 $ cd kubernetes/samples/scripts/create-weblogic-domain/domain-home-in-image

site/user-guide.md

@@ -78,4 +78,7 @@ You can find the operator image in
 * Docker 18.03.1.ce (check with `docker version`).
 * Helm 2.8.2+ (check with `helm version`).
 * Oracle WebLogic Server 12.2.1.3.0 with patch 29135930.
+   * The existing WebLogic Docker image, `store/oracle/weblogic:12.2.1.3`,
+was updated on January 17, 2019, and has all the necessary patches applied.
+   * A `docker pull` is required if you already have this image.
 * You must have the `cluster-admin` role to install the operator.