Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: oracle/weblogic-image-tool
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: release-1.13.0
Choose a base ref
...
head repository: oracle/weblogic-image-tool
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: release-1.13.1
Choose a head ref
  • 5 commits
  • 10 files changed
  • 1 contributor

Commits on Apr 11, 2024

  1. Copy the full SHA
    672d152 View commit details
  2. Copy the full SHA
    937febf View commit details

Commits on Apr 14, 2024

  1. Fix jar installer

    ddsharpe committed Apr 14, 2024
    Copy the full SHA
    b4b2f5f View commit details
  2. Merge branch 'fix-jar-installer' into 'main'

    Fix jar installer
    
    See merge request weblogic-cloud/weblogic-image-tool!472
    ddsharpe committed Apr 14, 2024
    Copy the full SHA
    3dd568f View commit details
  3. release 1.13.1

    ddsharpe committed Apr 14, 2024
    Copy the full SHA
    7ff414c View commit details
3 changes: 2 additions & 1 deletion documentation/site/content/_index.md
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ the cloud, and to simplify and speed up the application deployment life cycle. B
and Kubernetes, WebLogic now runs in a cloud neutral infrastructure. To help simplify and automate the creation of
container images for WebLogic Server, we are providing this open source WebLogic Image Tool (WIT).

WIT let's you create a new Linux based image, with installations of a JDK and WebLogic Server, and optionally,
WIT lets you create a new Linux based image, with installations of a JDK and WebLogic Server, and optionally,
configure a WebLogic domain with your applications, apply WebLogic Server patches, or update an existing image.


@@ -56,6 +56,7 @@ Use WebLogic Image Tool to create, update, and rebase the following FMW product
* Oracle WebLogic Server (WLS)
* Fusion Middleware Infrastructure (FMW)
* Oracle BPM Suite for business process (SOA)
* Oracle HTTP Server (OHS_DB19)
* Oracle Service Bus (OSB)
* Oracle Data Integrator (ODI)
* Oracle Access Management (OAM)
4 changes: 2 additions & 2 deletions documentation/site/content/userguide/tools/create-image.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: "Create Image"
date: 2019-02-23
date: 2024-04-11
draft: false
weight: 1
description: "The create command creates a new container image and installs the requested Java and WebLogic software."
@@ -47,7 +47,7 @@ Usage: imagetool create [OPTIONS]
| `--skipcleanup` | Do not delete the build context folder, intermediate images, and failed build containers. For debugging purposes. | |
| `--strictPatchOrdering` | Instruct OPatch to apply patches one at a time (uses `apply` instead of `napply`). | |
| `--target` | Select the target environment in which the created image will be used. Supported values: `Default` (Docker/Kubernetes), `OpenShift`. See [Additional information](#--target). | `Default` |
| `--type` | Installer type. Supported values: `WLS`, `WLSDEV`, `WLSSLIM`, `FMW`, `IDM`, `OSB`, `OUD_WLS`, `SOA_OSB`, `SOA_OSB_B2B`, `MFT`, `WCP`, `OAM`, `OIG`, `OUD`, `OID`, `ODI`, `SOA`, `WCC`, `WCS`, `WCP` | `WLS` |
| `--type` | Installer type. Supported values: `WLS`, `WLSDEV`, `WLSSLIM`, `FMW`, `IDM`, `OHS`, `OHS_DB19`, `OSB`, `OUD_WLS`, `SOA_OSB`, `SOA_OSB_B2B`, `MFT`, `WCP`, `OAM`, `OIG`, `OUD`, `OID`, `ODI`, `SOA`, `WCC`, `WCS`, `WCP` | `WLS` |
| `--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`. | |
| `--version` | Installer version. | `12.2.1.3.0` |
| `--wdtArchive` | A WDT archive ZIP file or comma-separated list of files. | |
4 changes: 2 additions & 2 deletions documentation/site/content/userguide/tools/rebase-image.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: "Rebase Image"
date: 2019-02-23
date: 2024-04-11
draft: false
weight: 3
description: "The rebase command creates a new container image using an existing WebLogic domain from an existing image."
@@ -46,7 +46,7 @@ Usage: imagetool rebase [OPTIONS]
| `--strictPatchOrdering` | Instruct OPatch to apply patches one at a time (uses `apply` instead of `napply`). | |
| `--target` | Select the target environment in which the created image will be used. Supported values: `Default` (Docker/Kubernetes), `OpenShift`. See [Additional information](#--target). | `Default` |
| `--targetImage` | Container image to extend for the domain's new image. | |
| `--type` | Installer type. Supported values: `WLS`, `WLSDEV`, `WLSSLIM`, `FMW`, `IDM`, `OSB`, `OUD_WLS`, `SOA_OSB`, `SOA_OSB_B2B`, `MFT`, `WCP`, `OAM`, `OIG`, `OUD`, `OID`, `ODI`, `SOA`, `WCC`, `WCS`, `WCP` | `WLS` |
| `--type` | Installer type. Supported values: `WLS`, `WLSDEV`, `WLSSLIM`, `FMW`, `IDM`, `OHS`, `OHS_DB19`, `OSB`, `OUD_WLS`, `SOA_OSB`, `SOA_OSB_B2B`, `MFT`, `WCP`, `OAM`, `OIG`, `OUD`, `OID`, `ODI`, `SOA`, `WCC`, `WCS`, `WCP` | `WLS` |
| `--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`. | |
| `--version` | Installer version. | `12.2.1.3.0` |

4 changes: 2 additions & 2 deletions documentation/site/content/userguide/tools/update-image.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: "Update Image"
date: 2019-02-23
date: 2024-04-11
draft: false
weight: 4
description: "The update command creates a new container image by applying WebLogic patches to an existing image."
@@ -48,7 +48,7 @@ Update WebLogic Docker image with selected patches
| `--skipcleanup` | Do not delete the build context folder, intermediate images, and failed build containers. For debugging purposes. | |
| `--strictPatchOrdering` | Instruct OPatch to apply patches one at a time (uses `apply` instead of `napply`). | |
| `--target` | Select the target environment in which the created image will be used. Supported values: `Default` (Docker/Kubernetes), `OpenShift`. See [Additional information](#--target). | `Default` |
| `--type` | Installer type. Supported values: `WLS`, `WLSDEV`, `WLSSLIM`, `FMW`, `IDM`, `OSB`, `OUD_WLS`, `SOA_OSB`, `SOA_OSB_B2B`, `MFT`, `WCP`, `OAM`, `OIG`, `OUD`, `OID`, `ODI`, `SOA`, `WCC`, `WCS`, `WCP` | Installer used in `fromImage` |
| `--type` | Installer type. Supported values: `WLS`, `WLSDEV`, `WLSSLIM`, `FMW`, `IDM`, `OHS`, `OHS_DB19`, `OSB`, `OUD_WLS`, `SOA_OSB`, `SOA_OSB_B2B`, `MFT`, `WCP`, `OAM`, `OIG`, `OUD`, `OID`, `ODI`, `SOA`, `WCC`, `WCS`, `WCP` | `WLS` |
| `--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`. | |
| `--wdtArchive` | A WDT archive ZIP file or comma-separated list of files. | |
| `--wdtDomainHome` | Path to the `-domain_home` for WDT. | `/u01/domains/base_domain` |
2 changes: 1 addition & 1 deletion imagetool/pom.xml
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@
<parent>
<artifactId>imagetool-parent</artifactId>
<groupId>com.oracle.weblogic.lifecycle.imagetool</groupId>
<version>1.13.0</version>
<version>1.13.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ RUN mkdir -p {{{oracle_home}}} \
{{#installJava}}COPY --from=jdk_build --chown={{userid}}:{{groupid}} {{{java_home}}} {{{java_home}}}/
{{/installJava}}

{{#installPackages}}COPY --chown={{userid}}:{{groupid}} {{installerFilename}} {{responseFile.name}} {{{tempDir}}}/
{{#installPackages}}COPY --chown={{userid}}:{{groupid}} {{installerFilename}} {{responseFile.name}} {{{tempDir}}}/{{{type}}}/
{{/installPackages}}
COPY --chown={{userid}}:{{groupid}} oraInst.loc {{inv_loc}}/

@@ -38,19 +38,19 @@ RUN echo "INSTALLING MIDDLEWARE" \
{{#installPackages}}
&& echo "INSTALLING {{type}}" \
# If installer is packaged in a ZIP, extract it before running it
{{#isZip}}&& unzip -q {{{tempDir}}}/{{installerFilename}} -d {{{tempDir}}}/{{{type}}} {{/isZip}} \
{{#isZip}}&& unzip -q {{{tempDir}}}/{{{type}}}/{{installerFilename}} -d {{{tempDir}}}/{{{type}}} {{/isZip}} \
{{#preinstallCommands}}&& {{{tempDir}}}/{{{type}}}/{{{.}}} {{/preinstallCommands}} \
# IF the installer is a JAR file (not a .bin), run the silent install using Java
{{^isBin}} && {{{java_home}}}/bin/java -Xmx1024m -jar {{{tempDir}}}/{{{type}}}/{{jarName}} \
-silent ORACLE_HOME={{{oracle_home}}} \
-responseFile {{{tempDir}}}/{{responseFile.name}} \
-responseFile {{{tempDir}}}/{{{type}}}/{{responseFile.name}} \
-invPtrLoc {{inv_loc}}/oraInst.loc \
-ignoreSysPrereqs -force -novalidation {{/isBin}} \
# If the installer is a BIN, make sure it is executable and run the installer
{{#isBin}} && chmod +x {{{tempDir}}}/{{{type}}}/{{jarName}} \
&& {{{tempDir}}}/{{{type}}}/{{jarName}} \
-force -ignoreSysPrereqs -silent \
-responseFile {{{tempDir}}}/{{responseFile.name}} \
-responseFile {{{tempDir}}}/{{{type}}}/{{responseFile.name}} \
-invPtrLoc {{inv_loc}}/oraInst.loc ORACLE_HOME={{{oracle_home}}} -jreLoc {{{java_home}}} {{/isBin}} \
{{/installPackages}}
&& test $? -eq 0 \
2 changes: 1 addition & 1 deletion installer/pom.xml
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@
<parent>
<artifactId>imagetool-parent</artifactId>
<groupId>com.oracle.weblogic.lifecycle.imagetool</groupId>
<version>1.13.0</version>
<version>1.13.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.oracle.weblogic.lifecycle.imagetool</groupId>
<artifactId>imagetool-parent</artifactId>
<version>1.13.0</version>
<version>1.13.1</version>
<packaging>pom</packaging>

<name>WebLogic Image Tool</name>
2 changes: 1 addition & 1 deletion tests/pom.xml
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
<parent>
<artifactId>imagetool-parent</artifactId>
<groupId>com.oracle.weblogic.lifecycle.imagetool</groupId>
<version>1.13.0</version>
<version>1.13.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Original file line number Diff line number Diff line change
@@ -104,7 +104,7 @@ private static void validateEnvironmentSettings() {
missingSettings.add("STAGING_DIR");
}

if (missingSettings.size() > 0) {
if (!missingSettings.isEmpty()) {
String error = String.join(", ", missingSettings)
+ " must be set as a system property in the pom.xml";
throw new IllegalArgumentException(error);
@@ -145,7 +145,7 @@ private static void verifyStagedFiles(String... installers) {
missingInstallers.add(installer);
}
}
if (missingInstallers.size() > 0) {
if (!missingInstallers.isEmpty()) {
String error = "Could not find these installers in the staging directory: " + STAGING_DIR + "\n ";
error += String.join("\n ", missingInstallers);
throw new IllegalStateException(error);
@@ -1162,4 +1162,42 @@ void createWlsImgWithOpenShiftSettings(TestInfo testInfo) throws Exception {
}

}

/**
* create a WLS image using a JAR installer not in a zip.
*
* @throws Exception - if any error occurs
*/
@Test
@Order(31)
@Tag("nightly")
@DisplayName("Create WebLogic Server image from a JAR")
void createWlsImgFromJar(TestInfo testInfo) throws Exception {
// Create an imagetool command to cache the JAR installer for 12.2.1.4.0
String cacheCommand = new CacheCommand()
.addInstaller(true)
.type("wls")
.version("12.2.1.4.0")
.path(Paths.get(STAGING_DIR, "fmw_12.2.1.4.0_wls_lite_generic.jar"))
.build();

// Create an imagetool command to build the image for 12.2.1.4.0
String tagName = build_tag + ":" + getMethodName(testInfo);
String buildCommand = new CreateCommand()
.tag(tagName)
.version("12.2.1.4.0")
.build();

try (PrintWriter out = getTestMethodWriter(testInfo)) {
// run imagetool cache command
CommandResult cacheResult = Runner.run(cacheCommand, out, logger);
assertEquals(0, cacheResult.exitValue(), "for command: " + cacheCommand);
// run imagetool build command
CommandResult buildResult = Runner.run(buildCommand, out, logger);
assertEquals(0, buildResult.exitValue(), "for command: " + buildCommand);

// verify that the container image was created
assertTrue(imageExists(tagName), "Image was not created: " + tagName);
}
}
}