Add OID support in WebLogic Imagetool (#308)

* Adding support for OID (executable installer)

* Fix extraction of bin file from zip

* Moved unzip of jar/bin installer in to a single block

* Removing optional parameters -printtime -printmemory -printdiskusage for bin installer.

Co-authored-by: Vivek Raj <vivek.raj@oracle.com>

Author: brahankv

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

@@ -41,7 +41,7 @@ Usage: imagetool create [OPTIONS]
 | `--resourceTemplates` | One or more files containing placeholders that need to be resolved by the Image Tool. See [Resource Template Files](#resource-template-files). |   |
 | `--strictPatchOrdering` |  Instruct OPatch to apply patches one at a time (uses `apply` instead of `napply`). |   |
 | `--tag` | (Required) Tag for the final build image. Example: `store/oracle/weblogic:12.2.1.3.0`  |   |
-| `--type` | Installer type. Supported values: `WLS`, `WLSDEV`, `WLSSLIM`, `FMW`, `IDM`, `OSB`, `OUD_WLS`, `SOA_OSB`, `SOA_OSB_B2B`, `MFT`, `WCP`, `OAM`, `OIG`, `OUD`, `SOA`, `WCC`, `WCS`, `WCP`  | `WLS`  |
+| `--type` | Installer type. Supported values: `WLS`, `WLSDEV`, `WLSSLIM`, `FMW`, `IDM`, `OSB`, `OUD_WLS`, `SOA_OSB`, `SOA_OSB_B2B`, `MFT`, `WCP`, `OAM`, `OIG`, `OUD`, `OID`, `SOA`, `WCC`, `WCS`, `WCP`  | `WLS`  |
 | `--user` | Oracle support email ID.  |   |
 | `--version` | Installer version. | `12.2.1.3.0`  |
 | `--wdtArchive` | Path to the WDT archive file used by the WDT model.  |   |

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

@@ -44,7 +44,7 @@ Usage: imagetool rebase [OPTIONS]
 | `--strictPatchOrdering` |  Instruct OPatch to apply patches one at a time (uses `apply` instead of `napply`). |   |
 | `--tag` | (Required) Tag for the final build image. Example: `store/oracle/weblogic:12.2.1.3.0`  |   |
 | `--targetImage` | Docker 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`, `SOA`, `WCC`, `WCS`, `WCP`  | `WLS`  |
+| `--type` | Installer type. Supported values: `WLS`, `WLSDEV`, `WLSSLIM`, `FMW`, `IDM`, `OSB`, `OUD_WLS`, `SOA_OSB`, `SOA_OSB_B2B`, `MFT`, `WCP`, `OAM`, `OIG`, `OUD`, `OID`, `SOA`, `WCC`, `WCS`, `WCP`  | `WLS`  |
 | `--user` | Your Oracle support email ID.  |   |
 | `--version` | Installer version. | `12.2.1.3.0`  |
 

imagetool/src/main/java/com/oracle/weblogic/imagetool/aru/AruProduct.java

@@ -19,6 +19,7 @@ public enum AruProduct {
     IDM("18391", "Oracle Identity Manager"),
     OAM("18388", "Oracle Access Manager"),
     OUD("19748", "Oracle Unified Directory"),
+    OID("10040", "Oracle Internet Directory"),
     WCC("13946", "Oracle WebCenter Content"),
     WCP("15224", "Oracle WebCenter Portal"),
     WCS("20995", "Oracle WebCenter Sites"),

imagetool/src/main/java/com/oracle/weblogic/imagetool/installer/DefaultResponseFile.java

@@ -29,6 +29,7 @@ public class DefaultResponseFile implements ResponseFile {
     private static final String R_OAM =
         "Collocated Oracle Identity and Access Manager (Managed through WebLogic server)";
     private static final String R_OUD = "Installation for Oracle Unified Directory";
+    private static final String R_OID = "Collocated Oracle Internet Directory Server (Managed through WebLogic server)";
     private static final String R_WCC = "WebCenter Content";
     private static final String R_WCP = "WebCenter Portal";
     private static final String R_WCS = "WebCenter Sites";
@@ -77,6 +78,9 @@ private static String getInstallTypeResponse(InstallerType installerType, FmwIns
             case OUD:
                 response = R_OUD;
                 break;
+            case OID:
+                response = R_OID;
+                break;
             case WCC:
                 response = R_WCC;
                 break;

imagetool/src/main/java/com/oracle/weblogic/imagetool/installer/FmwInstallerType.java

@@ -67,6 +67,9 @@ public enum FmwInstallerType {
     // Oracle Unified Directory
     OUD_WLS(Utils.toSet(FMW.products, AruProduct.OUD),
         InstallerType.FMW, InstallerType.OUD),
+    // Oracle Internet Directory
+    OID(Utils.toSet(FMW.products, AruProduct.OID),
+        InstallerType.FMW, InstallerType.OID),
     // Oracle WebCenter Content
     WCC(Utils.toSet(FMW.products, AruProduct.WCC),
         InstallerType.FMW, InstallerType.WCC),

imagetool/src/main/java/com/oracle/weblogic/imagetool/installer/InstallerType.java

@@ -20,6 +20,7 @@ public enum InstallerType {
     IDM("idm"),
     OAM("oam"),
     OUD("oud"),
+    OID("oid"),
     WCC("wcc"),
     WCP("wcp"),
     WCS("wcs"),

imagetool/src/main/java/com/oracle/weblogic/imagetool/installer/MiddlewareInstall.java

@@ -64,6 +64,9 @@ private static String getJarNameFromInstaller(Path installerFile) throws IOExcep
                     if (entryName.endsWith(".jar")) {
                         filename = entryName;
                         break;
+                    } else if (entryName.endsWith(".bin")) {
+                        filename = entryName;
+                        break;
                     }
                 }
             }
@@ -85,6 +88,7 @@ public void copyFiles(CacheStore cacheStore, String buildContextDir) throws IOEx
             installPackage.installerFilename = filePath.getFileName().toString();
             installPackage.jarName = getJarNameFromInstaller(filePath);
             installPackage.isZip = installPackage.installerFilename.endsWith(".zip");
+            installPackage.isBin = installPackage.jarName.endsWith(".bin");
             installPackage.responseFile.copyFile(buildContextDir);
         }
         logger.exiting();

imagetool/src/main/java/com/oracle/weblogic/imagetool/installer/MiddlewareInstallPackage.java

@@ -12,4 +12,5 @@ public class MiddlewareInstallPackage {
     String installerFilename;
     String jarName;
     boolean isZip = true;
+    boolean isBin = false;
 }

imagetool/src/main/resources/docker-files/install-middleware.mustache

@@ -35,9 +35,12 @@ USER {{userid}}
 RUN echo "INSTALLING MIDDLEWARE" \
 {{#installPackages}}
     && echo "INSTALLING {{type}}" \
-    && {{#isZip}}unzip -q {{{tempDir}}}/{{installerFilename}} "*.jar" -d {{{tempDir}}} &&{{/isZip}} \
-    {{{java_home}}}/bin/java -Xmx1024m -jar {{{tempDir}}}/{{jarName}} -silent ORACLE_HOME={{{oracle_home}}} \
-    -responseFile {{{tempDir}}}/{{responseFile.name}} -invPtrLoc {{inv_loc}}/oraInst.loc -ignoreSysPrereqs -force -novalidation \
+    && {{#isZip}}unzip -q {{{tempDir}}}/{{installerFilename}} "*.[jb][ai][rn]" -d {{{tempDir}}} &&{{/isZip}} \
+    {{^isBin}}{{{java_home}}}/bin/java -Xmx1024m -jar {{{tempDir}}}/{{jarName}} -silent ORACLE_HOME={{{oracle_home}}} \
+    -responseFile {{{tempDir}}}/{{responseFile.name}} -invPtrLoc {{inv_loc}}/oraInst.loc -ignoreSysPrereqs -force -novalidation {{/isBin}} \
+    {{#isBin}}chmod +x {{{tempDir}}}/{{jarName}} && \
+    {{{tempDir}}}/{{jarName}} -force -ignoreSysPrereqs -silent -responseFile {{{tempDir}}}/{{responseFile.name}} \
+    -invPtrLoc {{inv_loc}}/oraInst.loc ORACLE_HOME={{{oracle_home}}} -jreLoc {{{java_home}}} {{/isBin}} \
 {{/installPackages}}
 && test $? -eq 0 \
 && chmod -R g+r {{{oracle_home}}} \