Merge branch 'from-image-properties' into 'main'

New feature --fromImageProperties allows user to provide fromImage properties without docker run step

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

Author: ddsharpe

imagetool/pom.xml

@@ -13,7 +13,7 @@
     <parent>
         <artifactId>imagetool-parent</artifactId>
         <groupId>com.oracle.weblogic.lifecycle.imagetool</groupId>
-        <version>1.14.5-SNAPSHOT</version>
+        <version>1.15.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

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

@@ -4,7 +4,9 @@
 package com.oracle.weblogic.imagetool.cli.menu;
 
 import java.io.FileNotFoundException;
+import java.io.FileReader;
 import java.io.IOException;
+import java.io.Reader;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -198,6 +200,22 @@ void initializeOptions() throws InvalidCredentialException, IOException, Invalid
         logger.exiting();
     }
 
+    private Properties getBaseImageProperties() throws IOException, InterruptedException {
+        Properties props;
+        if (isOptionSet("--fromImageProperties")) {
+            props = new Properties();
+            try (Reader reader = new FileReader(fromImageProperties.toFile())) {
+                props.load(reader);
+                logger.info("IMG-0123", fromImageProperties);
+                logger.finer(props);
+            }
+        } else {
+            props = Utils.getBaseImageProperties(buildEngine, fromImage,
+                "/probe-env/inspect-image.sh", buildDir());
+        }
+        return props;
+    }
+
     /**
      * Set the docker options (dockerfile template bean) by extracting information from the fromImage.
      *
@@ -208,8 +226,7 @@ public void copyOptionsFromImage() throws IOException, InterruptedException {
         if (isOptionSet("--fromImage")) {
             logger.info("IMG-0002", fromImage);
 
-            Properties baseImageProperties = Utils.getBaseImageProperties(buildEngine, fromImage,
-                "/probe-env/inspect-image.sh", buildDir());
+            Properties baseImageProperties = getBaseImageProperties();
 
             String existingJavaHome = baseImageProperties.getProperty("javaHome", null);
             if (existingJavaHome != null) {
@@ -344,6 +361,14 @@ public Architecture getTargetArchitecture() {
     )
     private String fromImage;
 
+    @Option(
+        names = {"--fromImageProperties"},
+        paramLabel = "<Properties Filename>",
+        description = "Properties that describe the --fromImage.  "
+        + "If not provided, docker run will be used to inspect the --fromImage image."
+    )
+    private Path fromImageProperties;
+
     @Option(
         names = {"--httpProxyUrl"},
         paramLabel = "<HTTP proxy URL>",

imagetool/src/main/java/com/oracle/weblogic/imagetool/logging/LoggingFacade.java

@@ -3,6 +3,7 @@
 
 package com.oracle.weblogic.imagetool.logging;
 
+import java.util.Map;
 import java.util.logging.ConsoleHandler;
 import java.util.logging.FileHandler;
 import java.util.logging.Handler;
@@ -195,6 +196,20 @@ public void finer(String msg, Throwable thrown) {
         }
     }
 
+    /**
+     * Logs a message at the FINER level.
+     *
+     * @param map the message to log
+     */
+    public void finer(Map<Object,Object> map) {
+        if (isFinerEnabled()) {
+            CallerDetails details = inferCaller();
+            StringBuilder builder = new StringBuilder();
+            map.forEach((k, v) -> builder.append(k).append("=").append(v).append(";"));
+            logger.logp(Level.FINER, details.clazz, details.method, builder.toString());
+        }
+    }
+
     /**
      * Logs a message at the FINEST level.
      *

imagetool/src/main/resources/ImageTool.properties

@@ -121,3 +121,4 @@ IMG-0119=All parameters and options provided after the -- will be passed to the
 IMG-0120=Retries exhausted, unable to download patch from Oracle.  Try again later or manually add the patch to the cache to skip this download step.
 IMG-0121=Did not recognize architecture name {0}. Defaulted to AMD64.
 IMG-0122=Invalid patch {0} for version {1}. A patch cannot be both generic and architecture specific. Remove the invalid entry from the cache, like {0}_{1}_xxx64.
+IMG-0123=User specified fromImage properties with file: {0}

installer/pom.xml

@@ -13,7 +13,7 @@
     <parent>
         <artifactId>imagetool-parent</artifactId>
         <groupId>com.oracle.weblogic.lifecycle.imagetool</groupId>
-        <version>1.14.5-SNAPSHOT</version>
+        <version>1.15.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

pom.xml

@@ -8,7 +8,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.oracle.weblogic.lifecycle.imagetool</groupId>
     <artifactId>imagetool-parent</artifactId>
-    <version>1.14.5-SNAPSHOT</version>
+    <version>1.15.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>WebLogic Image Tool</name>

tests/pom.xml

@@ -12,7 +12,7 @@
     <parent>
         <artifactId>imagetool-parent</artifactId>
         <groupId>com.oracle.weblogic.lifecycle.imagetool</groupId>
-        <version>1.14.5-SNAPSHOT</version>
+        <version>1.15.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>