poc of create jrf domain with js atp changes

Author: gosurya-oracle

src/main/java/com/oracle/weblogicx/imagebuilder/api/model/DomainType.java

@@ -0,0 +1,35 @@
+/* Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved. */
+
+package com.oracle.weblogicx.imagebuilder.api.model;
+
+/**
+ * Supported domain type. wls, jrf or restricted jrf.
+ */
+public enum DomainType {
+    WLS("wls"),
+    JRF("jrf"),
+    RestrictedJRF("rjrf");
+
+    private String value;
+
+    DomainType(String value) {
+        this.value = value;
+    }
+
+/*
+    @Override
+    public String toString() {
+        return value;
+    }
+*/
+
+    public static DomainType fromValue(String value) {
+        for (DomainType eachType : DomainType.values()) {
+            if (eachType.value.equalsIgnoreCase(value)) {
+                return eachType;
+            }
+        }
+        throw new IllegalArgumentException("argument " + value + " does not match any DomainType");
+    }
+}
+

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

@@ -3,6 +3,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;
@@ -185,6 +186,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.createLink(Paths.get(tmpDirPath, wdtModelPath.getFileName().toString()), wdtModelPath);
                 retVal.add(BUILD_ARG);
@@ -345,4 +357,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/resources/docker-files/Dockerfile.ph

@@ -18,6 +18,7 @@ ARG ADMIN_PORT
 ARG MANAGED_SERVER_PORT
 ARG SCRIPTS_DIR
 ARG WDT_HOME
+ARG RCU_RUN_FLAG
 # END %%WDT_ARGS%% #
 
 # START %%WDT_ENV%% #
@@ -36,7 +37,8 @@ ENV WDT_PKG=${WDT_PKG:-weblogic-deploy.zip} \
     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} \
@@ -57,12 +59,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 \