Merge branch 'wdt-target-platform' into 'main'

fixed bug that caused the create operations to be unable to find the WDT installer when specifying a platform different from the host

See merge request weblogic-cloud/weblogic-image-tool!508

Author: ddsharpe

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

@@ -41,7 +41,7 @@ public CommandResponse call() throws Exception {
 
             copyOptionsFromImage();
 
-            wdtOptions.handleWdtArgs(dockerfileOptions, buildDir());
+            wdtOptions.handleWdtArgs(dockerfileOptions, buildDir(), getTargetArchitecture());
 
             // Create Dockerfile
             String dockerfile = Utils.writeDockerfile(buildDir() + File.separator + "Dockerfile",

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

@@ -35,7 +35,7 @@ public CommandResponse call() throws Exception {
             prepareNewImage();
 
             // build wdt args if user passes --wdtModelPath
-            wdtOptions.handleWdtArgs(dockerfileOptions, buildDir());
+            wdtOptions.handleWdtArgs(dockerfileOptions, buildDir(), getTargetArchitecture());
 
             // Create Dockerfile
             String dockerfile = Utils.writeDockerfile(buildDir() + File.separator + "Dockerfile",

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

@@ -139,7 +139,7 @@ public CommandResponse call() throws Exception {
             BuildCommand cmdBuilder = getInitialBuildCmd(buildDir());
 
             // build wdt args if user passes --wdtModelPath
-            wdtOptions.handleWdtArgs(dockerfileOptions, buildDir());
+            wdtOptions.handleWdtArgs(dockerfileOptions, buildDir(), getTargetArchitecture());
             dockerfileOptions.setWdtCommand(wdtOperation);
             if (dockerfileOptions.runRcu()
                 && (wdtOperation == WdtOperation.UPDATE || wdtOperation == WdtOperation.DEPLOY)) {

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

@@ -15,6 +15,7 @@
 import com.oracle.weblogic.imagetool.installer.InstallerType;
 import com.oracle.weblogic.imagetool.logging.LoggingFacade;
 import com.oracle.weblogic.imagetool.logging.LoggingFactory;
+import com.oracle.weblogic.imagetool.util.Architecture;
 import com.oracle.weblogic.imagetool.util.DockerfileOptions;
 import com.oracle.weblogic.imagetool.util.Utils;
 import picocli.CommandLine.Option;
@@ -57,7 +58,8 @@ public String wdtModelHome() {
      * @param tmpDir the tmp directory which is passed to docker as the build context directory
      * @throws IOException in case of error
      */
-    public void handleWdtArgs(DockerfileOptions dockerfileOptions, String tmpDir) throws IOException {
+    public void handleWdtArgs(DockerfileOptions dockerfileOptions, String tmpDir, Architecture architecture)
+        throws IOException {
         logger.entering(tmpDir);
 
         if (!userProvidedFiles() && skipWdtInstaller()) {
@@ -84,7 +86,7 @@ public void handleWdtArgs(DockerfileOptions dockerfileOptions, String tmpDir) th
         }
 
         if (!skipWdtInstaller()) {
-            CachedFile wdtInstaller = new CachedFile(InstallerType.WDT, wdtVersion);
+            CachedFile wdtInstaller = new CachedFile(InstallerType.WDT, wdtVersion, architecture);
             Path wdtfile = wdtInstaller.copyFile(cache(), tmpDir);
             dockerfileOptions.setWdtInstallerFilename(wdtfile.getFileName().toString());
         }

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

@@ -9,6 +9,7 @@
 
 import com.oracle.weblogic.imagetool.logging.LoggingFacade;
 import com.oracle.weblogic.imagetool.logging.LoggingFactory;
+import com.oracle.weblogic.imagetool.util.Architecture;
 import com.oracle.weblogic.imagetool.util.DockerfileOptions;
 import com.oracle.weblogic.imagetool.util.DomainHomeSourceType;
 import com.oracle.weblogic.imagetool.util.ResourceTemplateOptions;
@@ -36,7 +37,8 @@ public boolean modelOnly() {
      * @throws IOException in case of error
      */
     @Override
-    public void handleWdtArgs(DockerfileOptions dockerfileOptions, String tmpDir) throws IOException {
+    public void handleWdtArgs(DockerfileOptions dockerfileOptions, String tmpDir, Architecture architecture)
+        throws IOException {
         logger.entering(tmpDir);
         if (!userProvidedFiles()) {
             // user did not provide any WDT files, nothing to do for WDT.
@@ -48,7 +50,7 @@ public void handleWdtArgs(DockerfileOptions dockerfileOptions, String tmpDir) th
             throw new IllegalArgumentException(Utils.getMessage("IMG-0103"));
         }
         // user provided WDT files and a WDT installer, so call WdtBaseOptions.handleWdtArgs
-        super.handleWdtArgs(dockerfileOptions, tmpDir);
+        super.handleWdtArgs(dockerfileOptions, tmpDir, architecture);
 
         String encryptionKey = Utils.getPasswordFromInputs(encryptionKeyStr, encryptionKeyFile, encryptionKeyEnv);
         if (encryptionKey != null) {