Skip to content

Commit 4dd7960

Browse files
ddsharpeddsharpe
committed
Merge remote-tracking branch 'origin/main'
2 parents 5274f2b + d4afdf4 commit 4dd7960

File tree

4 files changed

+26
-26
lines changed

4 files changed

+26
-26
lines changed

‎documentation/1.11/content/userguide/tools/create-aux-image.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ This is an advanced option that let's you provide additional commands to the Doc
5050
The input for this parameter is a simple text file that contains one or more of the valid sections.
5151
Valid sections for `createAuxImage` are:
5252

53-
| Section | Build Stage | Timing |
54-
| --- | --- | --- |
55-
| `package-manager-packages` | All | A list of OS packages, such as `ftp gzip`, separated by line or space. |
56-
| `final-build-commands` | Final image | After all Image Tool actions are complete, and just before the container image is finalized. |
53+
| Section | Available Variables | Build Stage | Timing |
54+
| --- | --- | --- | --- |
55+
| `package-manager-packages` | None | All | A list of OS packages, such as `ftp gzip`, separated by line or space. |
56+
| `final-build-commands` | `AUXILIARY_IMAGE_PATH` `WDT_HOME` `WDT_MODEL_HOME`| Final image | After all Image Tool actions are complete, and just before the container image is finalized. |
5757

5858
Each section can contain one or more valid Dockerfile commands and would look like the following:
5959

‎documentation/1.11/content/userguide/tools/create-image.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -73,16 +73,16 @@ This is an advanced option that let's you provide additional commands to the Doc
7373
The input for this parameter is a simple text file that contains one or more of the valid sections.
7474
Valid sections for create are:
7575

76-
| Section | Build Stage | Timing |
77-
| --- | --- | --- |
78-
| `package-manager-packages` | All | A list of OS packages, such as `ftp gzip`, separated by line or space. |
79-
| `before-jdk-install` | Intermediate (JDK_BUILD) | Before the JDK is installed. |
80-
| `after-jdk-install` | Intermediate (JDK_BUILD) | After the JDK is installed. |
81-
| `before-fmw-install` | Intermediate (WLS_BUILD) | Before the Oracle Home is created. |
82-
| `after-fmw-install` | Intermediate (WLS_BUILD) | After all of the Oracle middleware installers are finished. |
83-
| `before-wdt-command` | Intermediate (WDT_BUILD) | Before WDT is installed. |
84-
| `after-wdt-command` | Intermediate (WDT_BUILD) | After WDT domain creation/update is complete. |
85-
| `final-build-commands` | Final image | After all Image Tool actions are complete, and just before the container image is finalized. |
76+
| Section | Available Variables | Build Stage | Timing |
77+
| --- | --- | --- | --- |
78+
| `package-manager-packages` | None | All | A list of OS packages, such as `ftp gzip`, separated by line or space. |
79+
| `before-jdk-install` | `JAVA_HOME` | Intermediate (JDK_BUILD) | Before the JDK is installed. |
80+
| `after-jdk-install` | `JAVA_HOME` | Intermediate (JDK_BUILD) | After the JDK is installed. |
81+
| `before-fmw-install` | `JAVA_HOME` `ORACLE_HOME` | Intermediate (WLS_BUILD) | Before the Oracle Home is created. |
82+
| `after-fmw-install` | `JAVA_HOME` `ORACLE_HOME` | Intermediate (WLS_BUILD) | After all of the Oracle middleware installers are finished. |
83+
| `before-wdt-command` | `DOMAIN_HOME` | Intermediate (WDT_BUILD) | Before WDT is installed. |
84+
| `after-wdt-command` | `DOMAIN_HOME` | Intermediate (WDT_BUILD) | After WDT domain creation/update is complete. |
85+
| `final-build-commands` | `JAVA_HOME` `ORACLE_HOME` _`DOMAIN_HOME`_ | Final image | After all Image Tool actions are complete, and just before the container image is finalized. `DOMAIN_HOME` is only available if WDT was used during the build. |
8686

8787
**NOTE**: Changes made in intermediate stages may not be carried forward to the final image unless copied manually.
8888
The Image Tool will copy the Java Home, Oracle Home, domain home, and WDT home directories to the final image.

‎documentation/1.11/content/userguide/tools/rebase-image.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ Usage: imagetool rebase [OPTIONS]
5656
This is an advanced option that let's you provide additional commands to the Docker build step.
5757
The input for this parameter is a simple text file that contains one or more of the valid sections. Valid sections for rebase:
5858

59-
| Section | Build Stage | Timing |
60-
| --- | --- | --- |
61-
| `before-jdk-install` | Intermediate (JDK_BUILD) | Before the JDK is installed. |
62-
| `after-jdk-install` | Intermediate (JDK_BUILD) | After the JDK is installed. |
63-
| `before-fmw-install` | Intermediate (WLS_BUILD) | Before the Oracle Home is created. |
64-
| `after-fmw-install` | Intermediate (WLS_BUILD) | After all of the Oracle middleware installers are finished. |
65-
| `final-build-commands` | Final image | After all Image Tool actions are complete, and just before the container image is finalized. |
59+
| Section | Available Variables | Build Stage | Timing |
60+
| --- | --- | --- | --- |
61+
| `before-jdk-install` | `JAVA_HOME` `DOMAIN_HOME`| Intermediate (JDK_BUILD) | Before the JDK is installed. |
62+
| `after-jdk-install` | `JAVA_HOME` `DOMAIN_HOME` | Intermediate (JDK_BUILD) | After the JDK is installed. |
63+
| `before-fmw-install` | `JAVA_HOME` `ORACLE_HOME` `DOMAIN_HOME` | Intermediate (WLS_BUILD) | Before the Oracle Home is created. |
64+
| `after-fmw-install` | `JAVA_HOME` `ORACLE_HOME` `DOMAIN_HOME` | Intermediate (WLS_BUILD) | After all of the Oracle middleware installers are finished. |
65+
| `final-build-commands` | `JAVA_HOME` `ORACLE_HOME` `DOMAIN_HOME` | Final image | After all Image Tool actions are complete, and just before the container image is finalized. |
6666

6767
**NOTE**: Changes made in intermediate stages may not be carried forward to the final image unless copied manually.
6868
The Image Tool will copy the Java Home and the Oracle Home directories to the final image.

‎documentation/1.11/content/userguide/tools/update-image.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,11 @@ Update WebLogic Docker image with selected patches
7272
This is an advanced option that let's you provide additional commands to the Docker build step.
7373
The input for this parameter is a simple text file that contains one or more of the valid sections. Valid sections for update:
7474

75-
| Section | Build Stage | Timing |
76-
| --- | --- | --- |
77-
| `before-wdt-command` | Intermediate (WDT_BUILD) | Before WDT is installed. |
78-
| `after-wdt-command` | Intermediate (WDT_BUILD) | After WDT domain creation/update is complete. |
79-
| `final-build-commands` | Final image | After all Image Tool actions are complete, and just before the container image is finalized. |
75+
| Section | Available Variables | Build Stage | Timing |
76+
| --- | --- | --- | --- |
77+
| `before-wdt-command` | `DOMAIN_HOME` | Intermediate (WDT_BUILD) | Before WDT is installed. |
78+
| `after-wdt-command` | `DOMAIN_HOME` | Intermediate (WDT_BUILD) | After WDT domain creation/update is complete. |
79+
| `final-build-commands` | `JAVA_HOME` `ORACLE_HOME` `DOMAIN_HOME` | Final image | After all Image Tool actions are complete, and just before the container image is finalized. |
8080

8181
NOTE: Changes made in intermediate stages may not be carried forward to the final image unless copied manually.
8282
The Image Tool will copy the domain home and the WDT home directories to the final image.

0 commit comments

Comments
 (0)