Added releasePackage attribute to INSPECT image. (#373)

Author: ddsharpe

imagetool/src/main/java/com/oracle/weblogic/imagetool/inspect/InspectOutput.java

@@ -73,6 +73,9 @@ public String toString() {
             result.append(jsonKeyValuePair(2, "id", os.id())).append(",\n");
             result.append(jsonKeyValuePair(2, "name", os.name())).append(",\n");
             result.append(jsonKeyValuePair(2, "version", os.version())).append("\n");
+            if (os.releasePackage() != null) {
+                result.append(jsonKeyValuePair(2, "releasePackage", os.releasePackage())).append("\n");
+            }
             result.append(pad(1)).append("},");
             result.append('\n');
         }

imagetool/src/main/java/com/oracle/weblogic/imagetool/inspect/OperatingSystemProperties.java

@@ -11,6 +11,7 @@ public class OperatingSystemProperties {
     private String id;
     private String version;
     private String name;
+    private String releasePackage;
 
     public String id() {
         return id;
@@ -24,6 +25,10 @@ public String name() {
         return name;
     }
 
+    public String releasePackage() {
+        return releasePackage;
+    }
+
     /**
      * Using the properties obtained from the image, extract the OS properties prefixed with __OS__.
      * @param imageProperties properties returned from the image inspection
@@ -37,6 +42,7 @@ public static OperatingSystemProperties getOperatingSystemProperties(Properties
             result.version = removeQuotes(imageProperties.getProperty("__OS__VERSION_ID"));
         }
         result.name = removeQuotes(imageProperties.getProperty("__OS__NAME"));
+        result.releasePackage = imageProperties.getProperty("__OS__RELEASE_PACKAGE");
         return result;
     }
 

imagetool/src/main/resources/probe-env/inspect-image-long.sh

@@ -86,6 +86,10 @@ fi
 
 if [ -f "/etc/os-release" ]; then
   grep '=' /etc/os-release | sed 's/^/__OS__/'
+    releasePackage="$(type rpm >/dev/null 2>&1  && rpm -qf /etc/os-release || echo '')"
+    if [ -n "$releasePackage" ]; then
+      echo __OS__RELEASE_PACKAGE=$releasePackage
+    fi
 elif type busybox > /dev/null 2>&1; then
   echo __OS__ID="bb"
   echo __OS__NAME="$(busybox | head -1 | awk '{ print $1 }')"

imagetool/src/main/resources/probe-env/inspect-image.sh

@@ -66,6 +66,10 @@ fi
 
 if [ -f "/etc/os-release" ]; then
   grep '=' /etc/os-release | sed 's/^/__OS__/'
+  releasePackage="$(type rpm >/dev/null 2>&1  && rpm -qf /etc/os-release || echo '')"
+  if [ -n "$releasePackage" ]; then
+    echo __OS__RELEASE_PACKAGE=$releasePackage
+  fi
 elif type busybox > /dev/null 2>&1; then
   echo __OS__ID="bb"
   echo __OS__NAME="$(busybox | head -1 | awk '{ print $1 }')"