fix WDT RCU parameter (#79)

Author: ddsharpe

imagetool/src/main/java/com/oracle/weblogic/imagetool/api/model/DomainType.java

@@ -7,14 +7,16 @@
  * Supported domain type. wls, jrf or restricted jrf.
  */
 public enum DomainType {
-    WLS("wls"),
-    JRF("jrf"),
-    RestrictedJRF("rjrf");
+    WLS("wls", WLSInstallerType.WLS),
+    JRF("jrf", WLSInstallerType.FMW),
+    RestrictedJRF("rjrf", WLSInstallerType.FMW);
 
     private String value;
+    private WLSInstallerType installer;
 
-    DomainType(String value) {
+    DomainType(String value, WLSInstallerType installer) {
         this.value = value;
+        this.installer = installer;
     }
 
     /**
@@ -30,5 +32,9 @@ public static DomainType fromValue(String value) {
         }
         throw new IllegalArgumentException("argument " + value + " does not match any DomainType");
     }
+
+    public WLSInstallerType installerType() {
+        return installer;
+    }
 }
 

imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/menu/CreateImage.java

@@ -177,6 +177,9 @@ private void copyResponseFilesToDir(String dirPath) throws IOException {
 
     @Override
     public WLSInstallerType getInstallerType() {
+        if (installerType == null) {
+            return getWdtDomainType().installerType();
+        }
         return installerType;
     }
 
@@ -187,9 +190,9 @@ public String getInstallerVersion() {
 
     @Option(
             names = {"--type"},
-            description = "Installer type. Default: ${DEFAULT-VALUE}. Supported values: ${COMPLETION-CANDIDATES}"
+            description = "Installer type. Default: WLS. Supported values: ${COMPLETION-CANDIDATES}"
     )
-    private WLSInstallerType installerType = WLSInstallerType.WLS;
+    private WLSInstallerType installerType;
 
     @Option(
             names = {"--version"},

imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/menu/ImageOperation.java

@@ -356,10 +356,7 @@ List<String> handleWdtArgsIfRequired(String tmpDir) throws IOException {
                 if (getInstallerType() != WLSInstallerType.FMW) {
                     throw new IOException("FMW installer is required for JRF domain");
                 }
-                if (runRcu) {
-                    retVal.add(Constants.BUILD_ARG);
-                    retVal.add("RCU_RUN_FLAG=" + "-run_rcu");
-                }
+                dockerfileOptions.setRunRcu(runRcu);
             }
 
             if (wdtArchivePath != null && Files.isRegularFile(wdtArchivePath)) {
@@ -410,6 +407,10 @@ private void addWdtUrl(String wdtKey) throws Exception {
         logger.exiting();
     }
 
+    public DomainType getWdtDomainType() {
+        return wdtDomainType;
+    }
+
     @Option(
             names = {"--useCache"},
             paramLabel = "<Cache Policy>",

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

@@ -42,6 +42,7 @@ public class DockerfileOptions {
     private DomainType wdtDomainType;
     private String wdtJavaOptions;
     private boolean wdtModelOnly;
+    private boolean wdtRunRcu;
 
     /**
      * Options to be used with the Mustache template.
@@ -68,6 +69,7 @@ public DockerfileOptions() {
         wdtModelList = new ArrayList<>();
         wdtArchiveList = new ArrayList<>();
         wdtVariableList = new ArrayList<>();
+        wdtRunRcu = false;
     }
 
     /**
@@ -465,6 +467,15 @@ public boolean modelOnly() {
         return wdtModelOnly;
     }
 
+    public boolean runRcu() {
+        return wdtRunRcu;
+    }
+
+    public DockerfileOptions setRunRcu(boolean value) {
+        wdtRunRcu = value;
+        return this;
+    }
+
     public String wlsdeploy_properties() {
         return wdtJavaOptions;
     }

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

@@ -107,13 +107,11 @@ RUN unzip -q {{{tmpDir}}}/$WLS_PKG -d {{{tmpDir}}} \
     LABEL WlsImageToolLayer="intermediate"
 
     ARG WDT_PKG
-    ARG RCU_RUN_FLAG
 
     ENV WDT_PKG=${WDT_PKG:-weblogic-deploy.zip} \
         WLSDEPLOY_PROPERTIES="{{wlsdeploy_properties}} -Djava.security.egd=file:/dev/./urandom" \
         LC_ALL=${DEFAULT_LOCALE:-en_US.UTF-8} \
         PROPERTIES_FILE_DIR={{{oracle_home}}}/properties \
-        RCU_RUN_FLAG=${RCU_RUN_FLAG:-} \
         DOMAIN_HOME={{{domain_home}}}
 
     COPY --chown={{userid}}:{{groupid}} ${WDT_PKG} {{{tmpDir}}}/
@@ -143,19 +141,18 @@ RUN unzip -q {{{tmpDir}}}/$WLS_PKG -d {{{tmpDir}}} \
     USER {{userid}}
 
     RUN unzip -q {{{tmpDir}}}/$WDT_PKG -d {{{wdt_home}}} \
-    && if [ -n "${RCU_RUN_FLAG}" ]; then RCU_RUN_OPT="-run_rcu"; fi
+        && cd {{{wdt_home}}}/weblogic-deploy/bin \
     {{^modelOnly}}
-        RUN cd {{{wdt_home}}}/weblogic-deploy/bin \
         && ./createDomain.sh \
         -oracle_home {{{oracle_home}}} \
         -domain_home {{{domain_home}}} \
         -domain_type {{domainType}} \
-        $RCU_RUN_OPT \
+        {{#runRcu}}
+            -run_rcu \
+        {{/runRcu}}
         {{{wdtVariableFileArgument}}} {{{wdtModelFileArgument}}} {{{wdtArchiveFileArgument}}}
     {{/modelOnly}}
     {{#modelOnly}}
-        RUN cd {{{wdt_home}}} \
-        && cd weblogic-deploy/bin \
         && chmod u+x ./*.sh \
         && ./validateModel.sh \
         -oracle_home {{{oracle_home}}} \

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

@@ -9,13 +9,11 @@
     LABEL WlsImageToolLayer="intermediate"
 
     ARG WDT_PKG
-    ARG RCU_RUN_FLAG
 
     ENV WDT_PKG=${WDT_PKG:-weblogic-deploy.zip} \
         WLSDEPLOY_PROPERTIES={{wlsdeploy_properties}} \
         LC_ALL=${DEFAULT_LOCALE:-en_US.UTF-8} \
         PROPERTIES_FILE_DIR={{{oracle_home}}}/properties \
-        RCU_RUN_FLAG=${RCU_RUN_FLAG:-} \
         DOMAIN_HOME={{{domain_home}}} \
         PATH=${PATH}:{{{java_home}}}/bin:{{{oracle_home}}}/oracle_common/common/bin:{{{oracle_home}}}/wlserver/common/bin:{{{domain_home}}}/bin:{{{oracle_home}}}
 
@@ -50,14 +48,15 @@
 
     {{^modelOnly}}
         RUN cd {{{wdt_home}}} \
-        && if [ -n "${RCU_RUN_FLAG}" ]; then RCU_RUN_OPT="-run_rcu"; fi \
         && cd weblogic-deploy/bin \
         && chmod u+x ./*.sh \
         && ./{{wdtCommand}} \
         -oracle_home {{{oracle_home}}} \
         -domain_home {{{domain_home}}} \
         -domain_type {{domainType}} \
-        $RCU_RUN_OPT \
+        {{#runRcu}}
+            -run_rcu \
+        {{/runRcu}}
         {{{wdtVariableFileArgument}}} {{{wdtModelFileArgument}}} {{{wdtArchiveFileArgument}}}
     {{/modelOnly}}
     {{#modelOnly}}