Add wdt properties (#63)

Add --wdtJavaOptions for specifying extra java system options for WLST

Author: jshum2479

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

@@ -359,6 +359,11 @@ protected List<String> handleWdtArgsIfRequired(String tmpDir) throws IOException
                 retVal.add("DOMAIN_HOME=" + wdtDomainHome);
             }
 
+            if (wdtJavaOptions != null) {
+                retVal.add(Constants.BUILD_ARG);
+                retVal.add("WLSDEPLOY_PROPERTIES=" + wdtJavaOptions);
+            }
+
             if (wdtVariablesPath != null && Files.isRegularFile(wdtVariablesPath)) {
                 String wdtVariableFilename = wdtVariablesPath.getFileName().toString();
                 Files.copy(wdtVariablesPath, Paths.get(tmpDir, wdtVariableFilename));
@@ -550,6 +555,12 @@ private void addWdtUrl(String wdtKey) throws Exception {
     )
     private String  wdtDomainHome;
 
+    @Option(
+            names = {"--wdtJavaOptions"},
+            description = "Java command line options for WDT"
+    )
+    private String wdtJavaOptions;
+
     @Unmatched
     List<String> unmatchedOptions;
 }

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

@@ -115,6 +115,7 @@ RUN unzip -q {{{tmpDir}}}/$WLS_PKG -d {{{tmpDir}}} \
     ARG MANAGED_SERVER_PORT
     ARG SCRIPTS_DIR
     ARG RCU_RUN_FLAG
+    ARG WLSDEPLOY_PROPERTIES
 
     ENV WDT_PKG=${WDT_PKG:-weblogic-deploy.zip} \
     ADMIN_NAME=${ADMIN_NAME:-admin-server} \
@@ -123,7 +124,7 @@ RUN unzip -q {{{tmpDir}}}/$WLS_PKG -d {{{tmpDir}}} \
     JAVA_HOME={{{java_home}}} \
     MANAGED_SERVER_NAME=${MANAGED_SERVER_NAME:-} \
     MANAGED_SERVER_PORT=${MANAGED_SERVER_PORT:-8001} \
-    WLSDEPLOY_PROPERTIES="-Djava.security.egd=file:/dev/./urandom" \
+    WLSDEPLOY_PROPERTIES="${WLSDEPLOY_PROPERTIES} -Djava.security.egd=file:/dev/./urandom" \
     DOMAIN_TYPE=${DOMAIN_TYPE:-WLS} \
     DOMAIN_PARENT=${DOMAIN_PARENT:-/u01/domains} \
     WDT_ARCHIVE=${WDT_ARCHIVE:-} \

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

@@ -20,6 +20,7 @@
     ARG MANAGED_SERVER_PORT
     ARG SCRIPTS_DIR
     ARG RCU_RUN_FLAG
+    ARG WLSDEPLOY_PROPERTIES
 
     ENV WDT_PKG=${WDT_PKG:-weblogic-deploy.zip} \
     ADMIN_NAME=${ADMIN_NAME:-admin-server} \
@@ -28,7 +29,7 @@
     JAVA_HOME={{{java_home}}} \
     MANAGED_SERVER_NAME=${MANAGED_SERVER_NAME:-} \
     MANAGED_SERVER_PORT=${MANAGED_SERVER_PORT:-8001} \
-    WLSDEPLOY_PROPERTIES="-Djava.security.egd=file:/dev/./urandom" \
+    WLSDEPLOY_PROPERTIES="${WLSDEPLOY_PROPERTIES} -Djava.security.egd=file:/dev/./urandom" \
     DOMAIN_TYPE=${DOMAIN_TYPE:-WLS} \
     DOMAIN_PARENT=${DOMAIN_PARENT:-/u01/domains} \
     WDT_ARCHIVE=${WDT_ARCHIVE:-} \

site/create-image.md

@@ -57,6 +57,8 @@ Build WebLogic docker image
                     path to the WDT variables file for use with the WDT model
       --wdtVersion=<wdtVersion>
                     WDT tool version to use
+      --wdtJavaOptions=<wdtJavaOptions>
+                    Java command line options for WDT
 ```
 
 ## Usage scenarios

site/update-image.md

@@ -52,6 +52,8 @@ Update WebLogic docker image with selected patches
                     path to the WDT variables file for use with the WDT model
       --wdtVersion=<wdtVersion>
                     WDT tool version to use
+      --wdtJavaOptions=<wdtJavaOptions>
+                    Java command line options for WDT
 ```
 
 ## Usage scenarios