Allow Model in Image use case (#65)

* added support for model in image - adds WDT and artifacts to image but does not create domain

* cleanup permissions and usage of variable braces

* set docker workdir to oracle home or domain home based on options selected

Author: ddsharpe

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

@@ -119,7 +119,7 @@ public CommandResponse call() throws Exception {
             // add directory to pass the context
             cmdBuilder.add(tmpDir);
             logger.info("docker cmd = " + String.join(" ", cmdBuilder));
-            Utils.runDockerCommand(isCLIMode, cmdBuilder, dockerLog);
+            Utils.runDockerCommand(isCliMode, cmdBuilder, dockerLog);
         } catch (Exception ex) {
             return new CommandResponse(-1, ex.getMessage());
         } finally {

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

@@ -46,16 +46,16 @@ public abstract class ImageOperation implements Callable<CommandResponse> {
     protected DockerfileOptions dockerfileOptions;
     protected CacheStore cacheStore = new CacheStoreFactory().get();
     private String nonProxyHosts = null;
-    boolean isCLIMode;
+    boolean isCliMode;
     String password;
 
     ImageOperation() {
         dockerfileOptions = new DockerfileOptions();
     }
 
-    ImageOperation(boolean isCLIMode) {
+    ImageOperation(boolean isCliMode) {
         this();
-        this.isCLIMode = isCLIMode;
+        this.isCliMode = isCliMode;
     }
 
     @Override
@@ -136,8 +136,6 @@ List<String> handlePatchFiles(String tmpDir, Path tmpPatchesDir) throws Exceptio
             }
         }
         if (!patchLocations.isEmpty()) {
-            retVal.add(Constants.BUILD_ARG);
-            retVal.add("PATCHDIR=" + Paths.get(tmpDir).relativize(tmpPatchesDir).toString());
             dockerfileOptions.setPatchingEnabled();
         }
         logger.exiting(retVal.size());
@@ -193,7 +191,7 @@ public Path createPatchesTempDirectory(String tmpDir) throws IOException {
         return tmpPatchesDir;
     }
 
-    void handleProxyUrls() throws IOException {
+    private void handleProxyUrls() throws IOException {
         httpProxyUrl = Utils.findProxyUrl(httpProxyUrl, Constants.HTTP);
         httpsProxyUrl = Utils.findProxyUrl(httpsProxyUrl, Constants.HTTPS);
         nonProxyHosts = Utils.findProxyUrl(nonProxyHosts, "none");
@@ -317,9 +315,12 @@ private List<String> getWdtRequiredBuildArgs(Path wdtVariablesPath) throws IOExc
      * @throws IOException in case of error
      */
     protected List<String> handleWdtArgsIfRequired(String tmpDir) throws IOException {
-        logger.finer("Entering CreateImage.handleWdtArgsIfRequired: " + tmpDir);
+        logger.entering(tmpDir);
+
         List<String> retVal = new LinkedList<>();
         if (wdtModelPath != null) {
+            dockerfileOptions.setWdtEnabled();
+            dockerfileOptions.setWdtModelOnly(wdtModelOnly);
             String[] modelFiles = wdtModelPath.toString().split(",");
             List<String> modelList = new ArrayList<>();
 
@@ -335,34 +336,28 @@ protected List<String> handleWdtArgsIfRequired(String tmpDir) throws IOException
             }
             dockerfileOptions.setWdtModels(modelList);
 
+            dockerfileOptions.setWdtDomainType(wdtDomainType);
             if (wdtDomainType != DomainType.WLS) {
                 if (installerType != WLSInstallerType.FMW) {
                     throw new IOException("FMW installer is required for JRF domain");
                 }
-                retVal.add(Constants.BUILD_ARG);
-                retVal.add("DOMAIN_TYPE=" + wdtDomainType);
                 if (runRcu) {
                     retVal.add(Constants.BUILD_ARG);
                     retVal.add("RCU_RUN_FLAG=" + "-run_rcu");
                 }
             }
-            dockerfileOptions.setWdtEnabled();
 
             if (wdtArchivePath != null && Files.isRegularFile(wdtArchivePath)) {
                 String wdtArchiveFilename = wdtArchivePath.getFileName().toString();
                 Files.copy(wdtArchivePath, Paths.get(tmpDir, wdtArchiveFilename));
-                retVal.add(Constants.BUILD_ARG);
-                retVal.add("WDT_ARCHIVE=" + wdtArchiveFilename);
-            }
-            if (wdtDomainHome != null) {
-                retVal.add(Constants.BUILD_ARG);
-                retVal.add("DOMAIN_HOME=" + wdtDomainHome);
+                //Until WDT supports multiple archives, take single file argument from CLI and convert to list
+                List<String> archives = new ArrayList<>();
+                archives.add(wdtArchiveFilename);
+                dockerfileOptions.setWdtArchives(archives);
             }
+            dockerfileOptions.setDomainHome(wdtDomainHome);
 
-            if (wdtJavaOptions != null) {
-                retVal.add(Constants.BUILD_ARG);
-                retVal.add("WLSDEPLOY_PROPERTIES=" + wdtJavaOptions);
-            }
+            dockerfileOptions.setJavaOptions(wdtJavaOptions);
 
             if (wdtVariablesPath != null && Files.isRegularFile(wdtVariablesPath)) {
                 String wdtVariableFilename = wdtVariablesPath.getFileName().toString();
@@ -372,7 +367,7 @@ protected List<String> handleWdtArgsIfRequired(String tmpDir) throws IOException
                 retVal.addAll(getWdtRequiredBuildArgs(wdtVariablesPath));
             }
         }
-        logger.finer("Exiting CreateImage.handleWdtArgsIfRequired: ");
+        logger.exiting();
         return retVal;
     }
 
@@ -561,6 +556,14 @@ private void addWdtUrl(String wdtKey) throws Exception {
     )
     private String wdtJavaOptions;
 
+
+    @Option(
+        names = {"--wdtModelOnly"},
+        description = "Install WDT and copy the models to the image, but do not create the domain. "
+            + "Default: ${DEFAULT-VALUE}."
+    )
+    private boolean wdtModelOnly = false;
+
     @Unmatched
     List<String> unmatchedOptions;
 }

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

@@ -183,7 +183,7 @@ public CommandResponse call() throws Exception {
             cmdBuilder.add(tmpDir);
 
             logger.info("docker cmd = " + String.join(" ", cmdBuilder));
-            Utils.runDockerCommand(isCLIMode, cmdBuilder, dockerLog);
+            Utils.runDockerCommand(isCliMode, cmdBuilder, dockerLog);
 
         } catch (Exception ex) {
             return new CommandResponse(-1, ex.getMessage());