Adding support for WDT tar.gz installer (#277)

Author: robertpatrick

imagetool/src/main/java/com/oracle/weblogic/imagetool/util/DockerfileOptions.java

@@ -534,6 +534,19 @@ public boolean isWdtEnabled() {
         return useWdt;
     }
 
+    /**
+     * Referenced by the Dockerfile template to determine which command to use to install WDT.
+     *
+     * @return true if the WDT installer file is a tar.gz file; false otherwise.
+     */
+    public boolean usingWdtTarGzInstaller() {
+        boolean result = false;
+        if (wdtInstallerFilename != null && wdtInstallerFilename.toLowerCase().endsWith(".tar.gz")) {
+            result = true;
+        }
+        return result;
+    }
+
     /**
      * copyOraInst check if it needs to copy the oraInst.loc file.
      *
@@ -773,8 +786,9 @@ public String wdtInstaller() {
         return wdtInstallerFilename;
     }
 
-    public void setWdtInstallerFilename(String value) {
+    public DockerfileOptions setWdtInstallerFilename(String value) {
         wdtInstallerFilename = value;
+        return this;
     }
 
     public boolean modelOnly() {

imagetool/src/main/resources/docker-files/Create_Image.mustache

@@ -115,7 +115,13 @@ RUN echo "INSTALLING MIDDLEWARE" \
         {{{.}}}
     {{/beforeWdtCommand}}
 
-    RUN unzip -q {{{tempDir}}}/{{{wdtInstaller}}} -d {{{wdt_home}}}
+    {{#usingWdtTarGzInstaller}}
+        RUN tar zxf {{{tempDir}}}/{{{wdtInstaller}}} -C {{{wdt_home}}}
+    {{/usingWdtTarGzInstaller}}
+    {{^usingWdtTarGzInstaller}}
+        RUN unzip -q {{{tempDir}}}/{{{wdtInstaller}}} -d {{{wdt_home}}}
+    {{/usingWdtTarGzInstaller}}
+
     {{^modelOnly}}
         RUN cd {{{wdt_home}}}/weblogic-deploy/bin \
         && {{#isWdtUseEncryption}}echo {{{wdtEncryptionKey}}} | {{/isWdtUseEncryption}} ./createDomain.sh \

imagetool/src/test/java/com/oracle/weblogic/imagetool/util/DockerfileBuilderTest.java

@@ -37,6 +37,7 @@ void validateMustacheAliases() throws IOException {
             .setWdtDomainType("WLS")
             .setWdtModels(Arrays.asList("model1.yaml", "model2.yaml"))
             .setPackageInstaller(PackageManagerType.YUM)
+            .setWdtInstallerFilename("weblogic-deploy.zip")
             .setMiddlewareInstall(install);
 
         MustacheFactory mf = new DefaultMustacheFactory(new File("src/main/resources/docker-files"));