Enhance Update operation with additional WDT operations (#64)

* Added WDT updateDomain option for imagetool update operation

* java_home is not required on command line if JAVA_HOME is set in ENV

* added support for WDT deployApps

Author: ddsharpe

README.md

@@ -14,7 +14,8 @@ The Image Tool provides three functions within the main script:
   - [Create Image](site/create-image.md) - The `create` command creates a new Docker image and installs the requested 
   Java and WebLogic software.  Additionally, you can create a WebLogic domain in the image at the same time.
   - [Update Image](site/update-image.md) - The `update` command creates a new Docker image by applying WebLogic patches 
-  to an existing image.  Additionally, you can create a WebLogic domain if one did not exist previously.
+  to an existing image.  Additionally, you can create a WebLogic domain if one did not exist previously, update an 
+  an existing domain, or deploy an application.
   - [Cache](site/cache.md) - The Image Tool maintains metadata on the local file system for patches and installers.  
   The `cache` command can be used to manipulate the local metadata.
 

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

@@ -23,6 +23,7 @@
 import com.oracle.weblogic.imagetool.util.Constants;
 import com.oracle.weblogic.imagetool.util.Utils;
 import com.oracle.weblogic.imagetool.util.ValidationResult;
+import com.oracle.weblogic.imagetool.util.WdtOperation;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Option;
 
@@ -170,6 +171,7 @@ public CommandResponse call() throws Exception {
 
             // build wdt args if user passes --wdtModelPath
             cmdBuilder.addAll(handleWdtArgsIfRequired(tmpDir));
+            dockerfileOptions.setWdtCommand(wdtOperation);
 
             // resolve required patches
             cmdBuilder.addAll(handlePatchFiles(tmpDir, tmpPatchesDir));
@@ -219,5 +221,12 @@ List<String> handlePatchFiles(String tmpDir, Path tmpPatchesDir) throws Exceptio
     )
     private String opatchBugNumber;
 
+    @Option(
+        names = {"--wdtOperation"},
+        description = "Create a new domain, or update an existing domain.  Default: ${DEFAULT-VALUE}. "
+            + "Supported values: ${COMPLETION-CANDIDATES}"
+    )
+    private WdtOperation wdtOperation = WdtOperation.CREATE;
+
     private boolean opatchRequired = false;
 }

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

@@ -27,6 +27,7 @@ public class DockerfileOptions {
     private String tempDirectory;
     private String baseImageName;
     private ArrayList<String> wdtModelList;
+    private WdtOperation wdtOperation;
 
     /**
      * Options to be used with the Mustache template.
@@ -48,6 +49,8 @@ public DockerfileOptions() {
         tempDirectory = "/tmp/delme";
 
         baseImageName = "oraclelinux:7-slim";
+
+        wdtOperation = WdtOperation.CREATE;
     }
 
     /**
@@ -296,4 +299,22 @@ public void setTempDirectory(String value) {
 
         tempDirectory = value;
     }
+
+    /**
+     * Referenced by Dockerfile template, provides the command to run for WDT.  The default is createDomain.sh.
+     *
+     * @return the name of the WDT script file.
+     */
+    public String wdtCommand() {
+        return wdtOperation.getScript();
+    }
+
+    /**
+     * Set the desired WDT Operation to use during update.
+     *
+     * @param value  CREATE or UPDATE.
+     */
+    public void setWdtCommand(WdtOperation value) {
+        wdtOperation = value;
+    }
 }

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

@@ -0,0 +1,30 @@
+// Copyright 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+// Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
+
+package com.oracle.weblogic.imagetool.util;
+
+/**
+ * Command types for WebLogic Deploy Tooling.
+ * See GitHub project - https://github.com/oracle/weblogic-deploy-tooling
+ */
+public enum WdtOperation {
+
+    CREATE("createDomain.sh"),
+    UPDATE("updateDomain.sh"),
+    DEPLOY("deployApps.sh");
+
+    WdtOperation(String script) {
+        this.script = script;
+    }
+
+    private String script;
+
+    /**
+     * Get the WDT script to run that maps to this WDT operation.
+     * @return the Unix shell script name for the WDT command.
+     */
+    public String getScript() {
+        return script;
+    }
+
+}

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

@@ -153,7 +153,6 @@ RUN unzip -q {{{tmpDir}}}/$WLS_PKG -d {{{tmpDir}}} \
     && 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 \

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

@@ -57,9 +57,8 @@
     && if [ -n "${RCU_RUN_FLAG}" ]; then RCU_RUN_OPT="-run_rcu"; fi \
     && cd {{{wdt_home}}}/bin \
     && chmod u+x ./*.sh \
-    && ./createDomain.sh \
+    && ./{{wdtCommand}} \
     -oracle_home {{{oracle_home}}} \
-    -java_home {{{java_home}}} \
     -domain_home ${DOMAIN_HOME} \
     -domain_type ${DOMAIN_TYPE} \
     $RCU_RUN_OPT \

site/update-image.md

@@ -1,7 +1,15 @@
 # Update Image
 
-Use the `update` command to apply patches to an existing WebLogic Docker image. The required options for the command
-are marked with an asterisk (*). The password can be provided in one of the three ways:
+After you have created a Docker image with the Image Tool, you may want to change it from time to time.  The `update` 
+command should be used to update these existing Docker images created with the Image Tool.  For example, you may want to:
+* Apply a WebLogic patch
+* Apply the latest PSU from Oracle 
+* Create a new WebLogic domain (if one did not already exist) 
+* Deploy a new application to an existing domain
+* Modify the domain configuration (add a data source, change a port number, ...)
+ 
+The required options for the `update` command are marked with an asterisk (*), below. 
+**NOTE:** The password can be provided in one of the three ways:
 
 * Plain text
 * Environment variable
@@ -47,6 +55,9 @@ Update WebLogic docker image with selected patches
                       RestrictedJRF
       --wdtModel=<wdtModelPath>
                     path to the WDT model file that defines the Domain to create
+      --wdtOperation=<wdtOperation>
+                    Create a new domain, or update an existing domain.  Default:
+                      CREATE. Supported values: CREATE, UPDATE, DEPLOY                    
       --wdtRunRCU   instruct WDT to run RCU when creating the Domain
       --wdtVariables=<wdtVariablesPath>
                     path to the WDT variables file for use with the WDT model
@@ -76,5 +87,11 @@ installer is accessed from the cache with key wdt_1.1.1.  The model and archive
     imagetool update --fromImage wls:12.2.1.3.0 --tag mydomain:1 --wdtArchive ./wdt/my_domain.zip --wdtModel ./wdt/my_domain.yaml --wdtVersion 1.1.1
     ```
     
+- Use `deployApps` from WDT to deploy a new application, the WLS Metrics Exporter.  The model and archive to use are 
+located in a subfolder named `wdt`.
+    ```
+    imagetool update --tag mydomain:2 --fromImage mydomain:1 --wdtOperation deploy --wdtArchive ./wdt/exporter_archive.zip --wdtModel ./wdt/exporter_model.yaml --wdtVersion 1.1.1   
+    ``` 
+     
 ## Copyright
 Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.