Skip to content

Commit 59f14ab

Browse files
committed
Merge branch 'doc-version-update' into 'main'
Doc version update See merge request weblogic-cloud/weblogic-image-tool!506
2 parents f668351 + 59dc65a commit 59f14ab

File tree

4 files changed

+24
-24
lines changed

4 files changed

+24
-24
lines changed

.github/workflows/create-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
mvn -version
2020
mvn -B clean package
2121
- id: version
22-
run: echo "::set-output name=number::`echo "${{ github.ref_name }}" | sed 's/release-//'`"
22+
run: echo "name=number::`echo "${{ github.ref_name }}" | sed 's/release-//'`"
2323
- name: Create draft release and attach installer zip
2424
env:
2525
GH_TOKEN: ${{ github.token }}

documentation/site/content/userguide/tools/create-image.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Usage: imagetool create [OPTIONS]
1818

1919
| Parameter | Definition | Default |
2020
| --- | --- | --- |
21-
| `--tag` | **(Required)** Tag for the final build image. Example: `store/oracle/weblogic:12.2.1.3.0` | |
21+
| `--tag` | **(Required)** Tag for the final build image. Example: `store/oracle/weblogic:14.1.2.0.0` | |
2222
| `--additionalBuildCommands` | Path to a file with additional build commands. For more details, see [Additional information](#--additionalbuildcommands). |
2323
| `--additionalBuildFiles` | Additional files that are required by your `additionalBuildCommands`. A comma separated list of files that should be copied to the build context. See [Additional information](#--additionalbuildfiles). |
2424
| `--builder`, `-b` | Executable to process the Dockerfile. Use the full path of the executable if not on your path. | Defaults to `docker`, or, when set, to the value in environment variable `WLSIMG_BUILDER`. |
@@ -51,7 +51,7 @@ Usage: imagetool create [OPTIONS]
5151
| `--type` | Installer type. Supported values: `WLS`, `WLSDEV`, `WLSSLIM`, `FMW`, `IDM`, `MFT`, `OAM`, `ODI`, `OHS`, `OIG`, `OUD`, `OUD_WLS`, `OID`, `OSB`, `SOA`, `SOA_OSB`, `SOA_OSB_B2B`, `WCC`, `WCP`, `WCS` | `WLS` |
5252
| `--useBuildx` | Use BuildKit for building the container image. | |
5353
| `--user` | Oracle support email ID. When supplying `user`, you must supply the password either as an environment variable using `--passwordEnv`, or as a file using `--passwordFile`, or interactively, on the command line with `--password`. | |
54-
| `--version` | Installer version. | `12.2.1.3.0` |
54+
| `--version` | Installer version. | `14.1.2.0.0` |
5555
| `--wdtArchive` | A WDT archive ZIP file or comma-separated list of files. | |
5656
| `--wdtDomainHome` | Path to the `-domain_home` for WDT. | `/u01/domains/base_domain` |
5757
| `--wdtDomainType` | WDT domain type. Supported values: `WLS`, `JRF`, `RestrictedJRF` | `WLS` |
@@ -187,8 +187,8 @@ For example, create a file called `build_args`:
187187
```bash
188188
create
189189
--type wls
190-
--version 12.2.1.3.0
191-
--tag wls:122130
190+
--version 14.1.2.0.0
191+
--tag wls:141200
192192
--user acmeuser@mycompany.com
193193
--httpProxyUrl http://mycompany-proxy:80
194194
--httpsProxyUrl http://mycompany-proxy:80
@@ -208,7 +208,7 @@ $ imagetool @/path/to/build_args
208208
The following commands assume that all the required JDK, WLS, or FMW (WebLogic infrastructure) installers have been downloaded
209209
to the cache directory. Use the [cache]({{< relref "/userguide/tools/cache.md" >}}) command to set it up.
210210

211-
- Create an image named `sample:wls` with the WebLogic installer 12.2.1.3.0, server JDK 8u202, and latest PSU applied.
211+
- Create an image named `sample:wls` with the WebLogic installer 14.1.2.0.0, server JDK 21.0.6, and latest PSU applied.
212212
```bash
213213
$ imagetool create --tag sample:wls --latestPSU --user testuser@xyz.com --password hello
214214
```

documentation/site/content/userguide/tools/rebase-image.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Usage: imagetool rebase [OPTIONS]
1818
| Parameter | Definition | Default |
1919
| --- | --- | --- |
2020
| `--sourceImage` | (Required) Source Image containing the WebLogic domain. | |
21-
| `--tag` | (Required) Tag for the final build image. Example: `store/oracle/weblogic:12.2.1.3.0` | |
21+
| `--tag` | (Required) Tag for the final build image. Example: `store/oracle/weblogic:14.1.2.0.0` | |
2222
| `--additionalBuildCommands` | Path to a file with additional build commands. For more details, see [Additional information](#--additionalbuildcommands). |
2323
| `--additionalBuildFiles` | Additional files that are required by your `additionalBuildCommands`. A comma separated list of files that should be copied to the build context. See [Additional information](#--additionalbuildfiles). |
2424
| `--builder`, `-b` | Executable to process the Dockerfile. Use the full path of the executable if not on your path. | Defaults to `docker`, or, when set, to the value in environment variable `WLSIMG_BUILDER`. |
@@ -49,7 +49,7 @@ Usage: imagetool rebase [OPTIONS]
4949
| `--type` | Installer type. Supported values: `WLS`, `WLSDEV`, `WLSSLIM`, `FMW`, `IDM`, `MFT`, `OAM`, `ODI`, `OHS`, `OIG`, `OUD`, `OUD_WLS`, `OID`, `OSB`, `SOA`, `SOA_OSB`, `SOA_OSB_B2B`, `WCC`, `WCP`, `WCS` | `WLS` |
5050
| `--useBuildx` | Use BuildKit for building the container image. | |
5151
| `--user` | Your Oracle support email ID. When supplying `user`, you must supply the password either as an environment variable using `--passwordEnv`, or as a file using `--passwordFile`, or interactively, on the command line with `--password`. | |
52-
| `--version` | Installer version. | `12.2.1.3.0` |
52+
| `--version` | Installer version. | `14.1.2.0.0` |
5353

5454
### Additional information
5555

@@ -118,10 +118,10 @@ For example, create a file called `build_args`:
118118

119119
```bash
120120
rebase
121-
--tag wls:122140
122-
--sourceImage wls:122130
123-
--version 12.2.1.4.0
124-
--jdkVersion 8u221
121+
--tag wls:141200
122+
--sourceImage wls:141100
123+
--version 14.1.2.0.0
124+
--jdkVersion 21.0.6
125125
```
126126

127127
Use it on the command line, as follows:
@@ -139,22 +139,22 @@ The commands below assume that all the required JDK, WLS, or FMW (WebLogic infra
139139
to the cache directory. Use the [cache]({{< relref "/userguide/tools/cache.md" >}}) command to set it up.
140140

141141

142-
- Update the JDK for an existing domain. Copy the existing domain from `sample:v1` where the JDK was 8u202 to a new
143-
image called `sample:v2` and install the newer JDK 8u221 with WebLogic Server 12.2.1.3.0.
142+
- Update the JDK for an existing domain. Copy the existing domain from `sample:v1` where the JDK was 8u401 to a new
143+
image called `sample:v2` and install the newer JDK 21.0.6 with WebLogic Server 14.1.2.0.0.
144144
```bash
145-
$ imagetool rebase --tag sample:v2 --sourceImage sample:v1 --version 12.2.1.3.0 --jdkVersion 8u221
145+
$ imagetool rebase --tag sample:v2 --sourceImage sample:v1 --version 14.1.2.0.0 --jdkVersion 21.0.6
146146
```
147147

148148
- Update the Oracle Home for an existing domain with a newer WebLogic version. Copy a domain from an existing image to
149-
a new image with a new install of WebLogic Server 12.2.1.4.0. Copy the domain
149+
a new image with a new install of WebLogic Server 14.1.2.0.0. Copy the domain
150150
from `sample:v1` and select the desired WebLogic installer using the `--version` argument.
151151
```bash
152-
$ imagetool rebase --tag sample:v2 --sourceImage sample:v1 --version 12.2.1.4.0 --jdkVersion 8u221
152+
$ imagetool rebase --tag sample:v2 --sourceImage sample:v1 --version 14.1.4.0.0 --jdkVersion 21.0.6
153153
```
154154

155155
- Update the JDK and/or Oracle Home for an existing domain using another image with pre-installed binaries.
156156
Copy the domain from the source image named `sample:v1` to a new image called `sample:v2` based on a target image
157-
named `fmw:12214`. **Note**: The Oracle Home and JDK must be installed in the same same folders on each image.
157+
named `fmw:1412`. **Note**: The Oracle Home and JDK must be installed in the same folders on each image.
158158
```bash
159-
$ imagetool rebase --tag sample:v2 --sourceImage sample:v1 --targetImage fmw:12214
159+
$ imagetool rebase --tag sample:v2 --sourceImage sample:v1 --targetImage fmw:1412
160160
```

documentation/site/content/userguide/tools/update-image.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Update WebLogic Docker image with selected patches
2626
| Parameter | Definition | Default |
2727
| --- | --- | --- |
2828
| `--fromImage` | (Required) Container image to be extended. The provided image MUST contain an Oracle Home with middleware installed. The `fromImage` option serves as a starting point for the new image to be created. | |
29-
| `--tag` | (Required) Tag for the final build image. Example: `store/oracle/weblogic:12.2.1.3.0` | |
29+
| `--tag` | (Required) Tag for the final build image. Example: `store/oracle/weblogic:14.1.2.0.0` | |
3030
| `--additionalBuildCommands` | Path to a file with additional build commands. For more details, see [Additional information](#--additionalbuildcommands). | |
3131
| `--additionalBuildFiles` | Additional files that are required by your `additionalBuildCommands`. A comma separated list of files that should be copied to the build context. See [Additional information](#--additionalbuildfiles). | |
3232
| `--builder`, `-b` | Executable to process the Dockerfile. Use the full path of the executable if not on your path. | Defaults to `docker`, or, when set, to the value in environment variable `WLSIMG_BUILDER`. |
@@ -160,8 +160,8 @@ For example, create a file called `build_args`:
160160

161161
```bash
162162
update
163-
--fromImage weblogic:12.2.1.3.0
164-
--tag wls:122130-patched
163+
--fromImage weblogic:14.1.4.0.0
164+
--tag wls:141200-patched
165165
--patches 123456
166166
--user acmeuser@mycompany.com
167167
--passwordEnv MYPWD
@@ -189,10 +189,10 @@ $ imagetool @/path/to/build_args
189189
$ imagetool update --fromImage sample:1.0 --tag sample:1.1 --user test@xyz.com --password hello --patches 12345678,87654321
190190
```
191191

192-
- Update an image named `wls:12.2.1.3.0` by creating a new WebLogic domain using WDT and tag it as `mydomain:1`. The WDT
192+
- Update an image named `wls:14.1.4.0.0` by creating a new WebLogic domain using WDT and tag it as `mydomain:1`. The WDT
193193
installer is accessed from the cache with key wdt_1.1.1. The model and archive to use are located in a subfolder named `wdt`.
194194
```bash
195-
$ imagetool update --fromImage wls:12.2.1.3.0 --tag mydomain:1 --wdtArchive ./wdt/my_domain.zip --wdtModel ./wdt/my_domain.yaml --wdtVersion 1.1.1
195+
$ imagetool update --fromImage wls:14.1.4.0.0 --tag mydomain:1 --wdtArchive ./wdt/my_domain.zip --wdtModel ./wdt/my_domain.yaml --wdtVersion 1.1.1
196196
```
197197

198198
- Use `deployApps` from WDT to deploy a new application, the WLS Metrics Exporter. The model and archive to use are

0 commit comments

Comments
 (0)