Skip to content

Commit b22056f

Browse files
Merge pull request #50 from oracle/minor-edits
some fixing up
2 parents 4e79d54 + 8094af3 commit b22056f

File tree

2 files changed

+10
-12
lines changed

2 files changed

+10
-12
lines changed

documentation/staging/content/navigate/image.md

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,18 @@ in a Kubernetes environment using the [WebLogic Image Tool](https://oracle.githu
2424

2525
### Design View
2626
The `Design View` helps you specify the necessary data needed to run the WebLogic Image Tool to build an image for
27-
running the WebLogic domain with all resources configured and applications deployed.
28-
29-
Use the design view to create a new or use an existing (the default) `Primary Image` and, depending on your choice of [domain location]({{< relref "/navigate/project-settings#choosing-a-domain-location" >}}),
30-
an `Auxiliary Image`. Auxiliary images are available for "Model in Image" domains _only_.
27+
running the WebLogic domain with all resources configured and applications deployed. The `Design View` page is divided into `Primary Image` and `Auxiliary Image` pages.
28+
Auxiliary images are available for the "Model in Image" [domain location]({{< relref "/navigate/project-settings#choosing-a-domain-location" >}}) _only_.
3129

3230
- `Primary Image` - The image containing the Oracle Fusion Middleware software. It is used as the basis of all containers that run WebLogic Servers for the domain.
3331
- `Auxiliary Image` - The image that supplies the WebLogic Deploy Tooling software and the model files. At runtime, the auxiliary image's content is merged with the primary image's content.
3432

3533
One primary image can be reused for hundreds of domains whereas an auxiliary image is domain-specific. When using auxiliary images,
3634
the primary image contains the OS, JDK, and FMW software installations; the auxiliary image supplies the specifics for a single domain.
3735

38-
39-
The `Design View` page for the `Primary Image` and the `Auxiliary Image` is divided into several primary panes and a few advanced panes.
40-
Note that not all the fields described for the `Primary Image` are relevant for an `Auxiliary Image`, such as the JDK and Oracle installers, and patching. The exceptions will be called out.
36+
Use the `Design View` to create a new or use an existing (the default) `Primary Image` and, for Model in Image domains only, an `Auxiliary Image`.
37+
The `Design View` page for the `Primary Image` and the `Auxiliary Image` has several panes and a few advanced panes.
38+
Note that _not all_ the fields described for the `Primary Image` are relevant for an `Auxiliary Image`, such as the JDK and Oracle installers, and patching. The exceptions are noted.
4139

4240
- [Target Image Name and Registry Credentials](#target-image-name-and-registry-credentials)
4341
- [Base Image to Use](#base-image-to-use)
@@ -72,7 +70,7 @@ field. Any container image registry address found in the base image tag will be
7270
`Custom Base Image Pull Username` and `Custom Base Image Pull Password` fields.
7371

7472
When using a custom base image, the application requires the image to be inspected using the WebLogic Image Tool's
75-
[Inspect Image](https://oracle.github.io/weblogic-image-tool/userguide/tools/inspect-image/) command. Note that this
73+
[Inspect Image](https://oracle.github.io/weblogic-image-tool/userguide/tools/inspect-image/) command. **Note**: This
7674
action is relevant for `Primary Images` only. To invoke this inspection, click
7775
`Inspect Custom Base Image`. This inspection tells the application if Java or the
7876
Oracle Fusion Middleware software is already installed in the image. If it finds either of these software packages
@@ -115,7 +113,7 @@ latest capabilities, many of which are exposed by this application. As such, us
115113
recommended.
116114

117115
#### Patch Oracle Home
118-
This pane is relevant for `Primary Images` only. Oracle strongly recommends patching all Oracle Fusion Middleware installations with the latest Patch Set Updates (PSUs)
116+
**NOTE**: This pane is relevant for `Primary Images` only. Oracle strongly recommends patching all Oracle Fusion Middleware installations with the latest Patch Set Updates (PSUs)
119117
and other recommended patches to ensure that the latest security fixes are applied. This pane configures the WebLogic
120118
Image Tool to apply the specified patches to the Oracle Home during the image creation process. There are two mechanisms
121119
for specifying that patches should be applied:

documentation/staging/content/navigate/kubernetes/k8s-weblogic-domain.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ The following sections describe the other panes that support configuring the gen
8181
#### Primary Image to Use for the Domain
8282
This pane focuses on the container primary image to use to run the WebLogic Server domain in a container.
8383
- When using either "Model in Image" or "Domain in Image" [domain location]({{< relref "/navigate/project-settings#choosing-a-domain-location" >}}), the `Primary Image Tag` field is read-only; its value is set using the
84-
`Image Tag` field in the `Primary Image` section.
84+
`Image Tag` field in the `Image` section.
8585
- In the case of "Domain in PV", the `Image Tag` field is not read-only and _is_
8686
the place to specify the image to use to run the WebLogic domain's containers.
8787
- The read-only `Image Registry Address` field is populated by parsing the value of the `Image Tag` field
@@ -95,7 +95,7 @@ The choices are:
9595
- `Never` - Never pull the image; this will result in an error if the image is not already present on the Kubernetes node.
9696

9797
If pulling the image from the specified image registry does not require authentication,
98-
then `Specify Auxiliary Image Pull Credentials` should be disabled. When enabled, use the `Use Existing Image Pull Secret` field to tell the application
98+
then `Specify Image Pull Credentials` should be disabled. When enabled, use the `Use Existing Image Pull Secret` field to tell the application
9999
whether to use an existing image pull secret or create a new one. Specify the image pull secret name in the
100100
`Image Pull Secret Name` field. When creating a new secret, specify the secret data using the
101101
`Image Registry Pull Username`, `Image Registry Pull Email Address`, and `Image Registry Pull Password` fields.
@@ -104,7 +104,7 @@ whether to use an existing image pull secret or create a new one. Specify the i
104104

105105
For "Model in Image" domains only, this pane focuses on the container auxiliary image to use for the domain.
106106
- The `Auxiliary Image Tag` field is read-only; its value is set using the
107-
`Auxiliary Image Tag` field in the `Auxiliary Image` section of the Image page.
107+
`Auxiliary Image Tag` field in the `Auxiliary Image` page of the `Image` section.
108108
- Use the `Auxiliary Image Pull Policy` field to specify when to pull the domain's auxiliary image from the image registry. The choices are:
109109

110110
- `If Not Present` (default) - Only pull the image if it is not already present.

0 commit comments

Comments
 (0)