From 759c948573d4ed4865f20b074574ea4e3928e25a Mon Sep 17 00:00:00 2001 From: Rosemary Marano Date: Wed, 25 Oct 2023 14:29:47 -0400 Subject: [PATCH] Rearrange information --- .../site/content/base-images/_index.md | 2 -- .../site/content/base-images/ocr-images.md | 22 +++++++++++++++++++ .../choosing-a-model/_index.md | 18 +-------------- 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/documentation/site/content/base-images/_index.md b/documentation/site/content/base-images/_index.md index 1fe0797e4c5..34b65a2438a 100644 --- a/documentation/site/content/base-images/_index.md +++ b/documentation/site/content/base-images/_index.md @@ -8,5 +8,3 @@ description: "Obtain, create, and dynamically patch images for WebLogic Server o The following sections guide you through obtaining, creating, and dynamically updating WebLogic images. {{% children style="h4" description="true" %}} - -#### [Use or create WebLogic images depending on domain home source type]({{< relref "/managing-domains/choosing-a-model#use-or-create-weblogic-images-depending-on-domain-home-source-type" >}}) diff --git a/documentation/site/content/base-images/ocr-images.md b/documentation/site/content/base-images/ocr-images.md index ba6b0423f46..5fa98254ec9 100644 --- a/documentation/site/content/base-images/ocr-images.md +++ b/documentation/site/content/base-images/ocr-images.md @@ -280,3 +280,25 @@ Please review the following guidance to ensure that you are using recently patch To determine the patches and versions of software within a particular image, see [Inspect images](#inspect-images). For information about licensed access to WebLogic patches and CPU images, see [Supported environments]({{< relref "/introduction/platforms/environments.md" >}}). + +### Use or create WebLogic images depending on the domain home source type + +For information relevant to your chosen [domain home source type]({{< relref "/managing-domains/choosing-a-model/_index.md" >}}), refer to the following documentation: + +* Model in Image domains that use [auxiliary images]({{< relref "/managing-domains/model-in-image/auxiliary-images.md" >}}): + * [Understand Oracle Container Registry images]({{< relref "/base-images/ocr-images#understand-oracle-container-registry-images" >}}) + * [Obtain images from the Oracle Container Registry]({{< relref "/base-images/ocr-images#obtain-images-from-the-oracle-container-registry" >}}) + * [Create a custom image with patches applied]({{< relref "/base-images/custom-images#create-a-custom-image-with-patches-applied" >}}) + * [Auxiliary images]({{< relref "/managing-domains/model-in-image/auxiliary-images.md" >}}) + +* Model in Image domains that _do not_ use auxiliary images: +**NOTE**: Model in Image without auxiliary images (the WDT model and installation files are included in the same image with the WebLogic Server installation) is deprecated in WebLogic Kubernetes Operator version 4.0.7. Oracle recommends that you use Model in Image _with_ Auxiliary images. See [Auxiliary images]({{< relref "/managing-domains/model-in-image/auxiliary-images.md" >}}). + +* Domain in Image domains: **NOTE**: The Domain in Image domain home source type is deprecated in WebLogic Kubernetes Operator version 4.0. Oracle recommends that you choose either Domain on PV or Model in Image, depending on your needs. + * [Create a custom image with your domain inside the image]({{< relref "/base-images/custom-images#create-a-custom-image-with-your-domain-inside-the-image" >}}) + +* Domain on Persistent Volume (PV) domains: + * [Understand Oracle Container Registry images]({{< relref "/base-images/ocr-images#understand-oracle-container-registry-images" >}}) + * [Obtain images from the Oracle Container Registry]({{< relref "/base-images/ocr-images#obtain-images-from-the-oracle-container-registry" >}}) + * [Create a custom image with patches applied]({{< relref "/base-images/custom-images#create-a-custom-image-with-patches-applied" >}}) + * [Domain creation images]({{< relref "/managing-domains/domain-on-pv/domain-creation-images.md" >}}) diff --git a/documentation/site/content/managing-domains/choosing-a-model/_index.md b/documentation/site/content/managing-domains/choosing-a-model/_index.md index 323f912cb31..3b7d5128c52 100644 --- a/documentation/site/content/managing-domains/choosing-a-model/_index.md +++ b/documentation/site/content/managing-domains/choosing-a-model/_index.md @@ -68,20 +68,4 @@ There are advantages for each domain home source type where Model in Image is th ### Use or create WebLogic images depending on domain home source type -* Model in Image domains that use [auxiliary images]({{< relref "/managing-domains/model-in-image/auxiliary-images.md" >}}): - * [Understand Oracle Container Registry images]({{< relref "/base-images/ocr-images#understand-oracle-container-registry-images" >}}) - * [Obtain images from the Oracle Container Registry]({{< relref "/base-images/ocr-images#obtain-images-from-the-oracle-container-registry" >}}) - * [Create a custom image with patches applied]({{< relref "/base-images/custom-images#create-a-custom-image-with-patches-applied" >}}) - * [Auxiliary images]({{< relref "/managing-domains/model-in-image/auxiliary-images.md" >}}) - -* Model in Image domains that _do not_ use auxiliary images: -**NOTE**: Model in Image without auxiliary images (the WDT model and installation files are included in the same image with the WebLogic Server installation) is deprecated in WebLogic Kubernetes Operator version 4.0.7. Oracle recommends that you use Model in Image _with_ Auxiliary images. See [Auxiliary images]({{< relref "/managing-domains/model-in-image/auxiliary-images.md" >}}). - -* Domain in Image domains: **NOTE**: The Domain in Image domain home source type is deprecated in WebLogic Kubernetes Operator version 4.0. Oracle recommends that you choose either Domain on PV or Model in Image, depending on your needs. - * [Create a custom image with your domain inside the image]({{< relref "/base-images/custom-images#create-a-custom-image-with-your-domain-inside-the-image" >}}) - -* Domain on Persistent Volume (PV) domains: - * [Understand Oracle Container Registry images]({{< relref "/base-images/ocr-images#understand-oracle-container-registry-images" >}}) - * [Obtain images from the Oracle Container Registry]({{< relref "/base-images/ocr-images#obtain-images-from-the-oracle-container-registry" >}}) - * [Create a custom image with patches applied]({{< relref "/base-images/custom-images#create-a-custom-image-with-patches-applied" >}}) - * [Domain creation images]({{< relref "/managing-domains/domain-on-pv/domain-creation-images.md" >}}) +For information relevant to your chosen domain home source type, refer to the following [documentation]({{< relref "/base-images/ocr-images#use-or-create-weblogic-images-depending-on-the-domain-home-source-type" >}}).