fix bug with aux image where no models, archives, or variables are provided. (#324)

Author: ddsharpe

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

@@ -48,12 +48,14 @@ public String wdtModelHome() {
      * @param tmpDir the tmp directory which is passed to docker as the build context directory
      * @throws IOException in case of error
      */
-    void handleWdtArgs(DockerfileOptions dockerfileOptions, String tmpDir) throws IOException {
+    public void handleWdtArgs(DockerfileOptions dockerfileOptions, String tmpDir) throws IOException {
         logger.entering(tmpDir);
 
-        dockerfileOptions.setWdtEnabled()
-            .setWdtHome(wdtHome)
-            .setWdtModelHome(wdtModelHome);
+        if (isWdtModelProvided()) {
+            dockerfileOptions.setWdtEnabled();
+        }
+
+        dockerfileOptions.setWdtHome(wdtHome).setWdtModelHome(wdtModelHome);
 
         if (wdtModelPath != null) {
             List<String> modelList = addWdtFilesAsList(wdtModelPath, "model", tmpDir);

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

@@ -44,7 +44,7 @@ public boolean modelOnly() {
      * @throws IOException in case of error
      */
     @Override
-    void handleWdtArgs(DockerfileOptions dockerfileOptions, String tmpDir) throws IOException {
+    public void handleWdtArgs(DockerfileOptions dockerfileOptions, String tmpDir) throws IOException {
         logger.entering(tmpDir);
         if (!isUsingWdt()) {
             logger.exiting();

imagetool/src/main/resources/docker-files/aux-image.mustache

@@ -54,7 +54,9 @@ COPY --from=wdt_build --chown={{userid}}:{{groupid}} {{wdt_home}} {{wdt_home}}/
     COPY --chown={{userid}}:{{groupid}} {{{.}}} {{{wdt_model_home}}}/
 {{/wdtVariables}}
 
-RUN chmod -R 640 {{{wdt_model_home}}}/*
+{{#isWdtEnabled}}
+    RUN chmod -R 640 {{{wdt_model_home}}}/*
+{{/isWdtEnabled}}
 
 USER {{userid}}