restore overwritten code changes from master

Author: gosurya-oracle

src/main/java/com/oracle/weblogicx/imagebuilder/cli/cache/SetCacheDir.java

@@ -55,4 +55,4 @@ public CommandResponse call() {
             index = "0"
     )
     private Path location;
-}
+}

src/main/java/com/oracle/weblogicx/imagebuilder/cli/menu/CreateImage.java

@@ -5,6 +5,7 @@
 package com.oracle.weblogicx.imagebuilder.cli.menu;
 
 import com.oracle.weblogicx.imagebuilder.api.model.CommandResponse;
+import com.oracle.weblogicx.imagebuilder.api.model.DomainType;
 import com.oracle.weblogicx.imagebuilder.api.model.InstallerType;
 import com.oracle.weblogicx.imagebuilder.api.model.WLSInstallerType;
 import com.oracle.weblogicx.imagebuilder.impl.InstallerFile;
@@ -190,6 +191,17 @@ private List<String> handleWDTArgsIfRequired(Path tmpDir) throws IOException {
         String tmpDirPath = tmpDir.toAbsolutePath().toString();
         if (wdtModelPath != null) {
             if (Files.isRegularFile(wdtModelPath)) {
+                if (domainType != DomainType.WLS) {
+                    if (installerType != WLSInstallerType.FMW) {
+                        throw new IOException("FMW installer is required for JRF domain");
+                    }
+                    retVal.add(BUILD_ARG);
+                    retVal.add("DOMAIN_TYPE=" + domainType);
+                    if (rcu_run_flag) {
+                        retVal.add(BUILD_ARG);
+                        retVal.add("RCU_RUN_FLAG=" + "-run_rcu");
+                    }
+                }
                 filterStartTags.add("WDT_");
                 Path targetLink = Files.copy(wdtModelPath, Paths.get(tmpDirPath, wdtModelPath.getFileName().toString())
                     );
@@ -259,7 +271,7 @@ private List<InstallerFile> gatherRequiredInstallers() throws Exception {
         if (wdtModelPath != null && Files.isRegularFile(wdtModelPath)) {
             InstallerFile wdtInstaller = new InstallerFile(useCache, InstallerType.WDT, wdtVersion, null, null);
             retVal.add(wdtInstaller);
-            addWDTURL(wdtInstaller.getKey() + "_url");
+            addWDTURL(wdtInstaller.getKey());
         }
         retVal.add(new InstallerFile(useCache, InstallerType.fromValue(installerType.toString()), installerVersion,
                 userId, password));
@@ -270,11 +282,12 @@ private List<InstallerFile> gatherRequiredInstallers() throws Exception {
     /**
      * Parses wdtVersion and constructs the url to download WDT and adds the url to cache
      *
-     * @param wdtURLKey key in the format wdt_0.17
+     * @param wdtKey key in the format wdt_0.17
      * @throws Exception in case of error
      */
-    private void addWDTURL(String wdtURLKey) throws Exception {
-        if (cacheStore.getValueFromCache(wdtURLKey) == null) {
+    private void addWDTURL(String wdtKey) throws Exception {
+        String wdtURLKey = wdtKey + "_url";
+        if (cacheStore.getValueFromCache(wdtKey) == null) {
             if (useCache == ALWAYS) {
                 throw new Exception("CachePolicy prohibits download. Add the required wdt installer to cache");
             }
@@ -355,4 +368,18 @@ private void copyResponseFilesToDir(String dirPath) throws IOException {
             defaultValue = "latest"
     )
     private String wdtVersion;
+
+    @Option(
+            names = {"--domainType"},
+            description = "type of domain to create. default: ${DEFAULT-VALUE}. supported values: ${COMPLETION-CANDIDATES}",
+            defaultValue = "wls",
+            required = true
+    )
+    private DomainType domainType;
+
+    @Option(
+            names = "--run_rcu",
+            description = "whether to run rcu to create the required database schemas"
+    )
+    private boolean rcu_run_flag = false;
 }

src/main/java/com/oracle/weblogicx/imagebuilder/util/XPathUtil.java

@@ -106,4 +106,4 @@ public static final void prettyPrint(Document xml) {
     }
 
 
-}
+}

src/main/resources/docker-files/Dockerfile.ph

@@ -20,6 +20,7 @@ ARG ADMIN_PORT
 ARG MANAGED_SERVER_PORT
 ARG SCRIPTS_DIR
 ARG WDT_HOME
+ARG RCU_RUN_FLAG
 # END %%WDT_ARGS%% #
 
 # START %%WDT_ENV%% #
@@ -30,15 +31,18 @@ ENV WDT_PKG=${WDT_PKG:-weblogic-deploy.zip} \
     MANAGED_SERVER_NAME=${MANAGED_SERVER_NAME:-} \
     MANAGED_SERVER_PORT=${MANAGED_SERVER_PORT:-8001} \
     WDT_MODEL=${WDT_MODEL:-} \
+    WLSDEPLOY_PROPERTIES="-Djava.security.egd=file:/dev/./urandom" \
     DOMAIN_TYPE=${DOMAIN_TYPE:-WLS} \
     DOMAIN_PARENT=${DOMAIN_PARENT:-${ORACLE_HOME}/user_projects/domains} \
     DOMAIN_NAME=${DOMAIN_NAME:-base_domain} \
     WDT_ARCHIVE=${WDT_ARCHIVE:-} \
     WDT_VARIABLE=${WDT_VARIABLE:-} \
+    LC_ALL=${DEFAULT_LOCALE:-en_US.UTF-8} \
     PROPERTIES_FILE_DIR=$ORACLE_HOME/properties \
     SCRIPT_HOME="${ORACLE_HOME}" \
     WDT_HOME=${WDT_HOME:-/u01/app/weblogic-deploy} \
-    SCRIPTS_DIR=${SCRIPTS_DIR:-scripts}
+    SCRIPTS_DIR=${SCRIPTS_DIR:-scripts} \
+    RCU_RUN_FLAG=${RCU_RUN_FLAG:-}
 
 # DO NOT COMBINE THESE BLOCKS. It won't work when formatting variables like DOMAIN_HOME
 ENV DOMAIN_HOME=${DOMAIN_PARENT}/${DOMAIN_NAME} \
@@ -59,12 +63,14 @@ RUN mkdir -p $(dirname ${DOMAIN_HOME}) \
  && if [ -n "$WDT_MODEL" ]; then MODEL_OPT="-model_file ${OTMPDIR}/${WDT_MODEL##*/}"; fi \
  && if [ -n "$WDT_ARCHIVE" ]; then ARCHIVE_OPT="-archive_file ${OTMPDIR}/${WDT_ARCHIVE##*/}"; fi \
  && if [ -n "$WDT_VARIABLE" ]; then VARIABLE_OPT="-variable_file ${OTMPDIR}/${WDT_VARIABLE##*/}"; fi \
+ && if [ -n "${RCU_RUN_FLAG}" ]; then RCU_RUN_OPT="-run_rcu"; fi \
  && cd ${WDT_HOME}/bin \
  && ${WDT_HOME}/bin/createDomain.sh \
  -oracle_home ${ORACLE_HOME} \
  -java_home ${JAVA_HOME} \
  -domain_home ${DOMAIN_HOME} \
  -domain_type ${DOMAIN_TYPE} \
+ $RCU_RUN_OPT \
  $VARIABLE_OPT \
  $MODEL_OPT \
  $ARCHIVE_OPT \

src/main/resources/docker-files/Dockerfile.update

@@ -37,4 +37,4 @@ USER oracle
 
 # PLACEHOLDER FOR %%PATCH_CLEANUP%% #
 
-RUN rm -rf $OTMPDIR
+RUN rm -rf $OTMPDIR

src/main/resources/probe-env/test-update-env.sh

@@ -50,4 +50,4 @@ fi
 #echo OPATCH_VERSION=$($ORACLE_HOME/OPatch/opatch version 2> /dev/null | perl -n -e'/\s+([\d\.]+)\s+/ && print $1')
 #echo OS_ID=$(cat /etc/os-release 2> /dev/null | perl -ne '/^ID=\"(\S+)\"$/ && print $1')
 #echo OS_VERSION_ID=$(cat /etc/os-release 2> /dev/null | perl -ne '/^VERSION_ID=\"(\S+)\"$/ && print $1')
-#$ORACLE_HOME/OPatch/opatch lsinventory > /tmp_scripts/opatch-lsinventory.xml 2>&1
+#$ORACLE_HOME/OPatch/opatch lsinventory > /tmp_scripts/opatch-lsinventory.xml 2>&1