diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/inspect/InspectOutput.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/inspect/InspectOutput.java index 0f8f96aae..90558d479 100644 --- a/imagetool/src/main/java/com/oracle/weblogic/imagetool/inspect/InspectOutput.java +++ b/imagetool/src/main/java/com/oracle/weblogic/imagetool/inspect/InspectOutput.java @@ -72,7 +72,8 @@ public String toString() { result.append(pad(1)).append('\"').append("os").append('\"').append(" : {\n"); 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())); + result.append(jsonKeyValuePair(2, "version", os.version())).append(",\n"); + result.append(jsonKeyValuePair(2, "architecture", os.architecture())); if (os.releasePackage() != null) { result.append(",\n"); result.append(jsonKeyValuePair(2, "releasePackage", os.releasePackage())).append("\n"); diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/inspect/OperatingSystemProperties.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/inspect/OperatingSystemProperties.java index 0fee2c34d..7bb044c0b 100644 --- a/imagetool/src/main/java/com/oracle/weblogic/imagetool/inspect/OperatingSystemProperties.java +++ b/imagetool/src/main/java/com/oracle/weblogic/imagetool/inspect/OperatingSystemProperties.java @@ -12,6 +12,7 @@ public class OperatingSystemProperties { private String version; private String name; private String releasePackage; + private String architecture; public String id() { return id; @@ -29,6 +30,10 @@ public String releasePackage() { return releasePackage; } + public String architecture() { + return architecture; + } + /** * Using the properties obtained from the image, extract the OS properties prefixed with __OS__. * @param imageProperties properties returned from the image inspection @@ -43,6 +48,7 @@ public static OperatingSystemProperties getOperatingSystemProperties(Properties } result.name = removeQuotes(imageProperties.getProperty("__OS__NAME")); result.releasePackage = removeQuotes(imageProperties.getProperty("__OS__RELEASE_PACKAGE")); + result.architecture = imageProperties.getProperty("__OS__arch"); return result; } diff --git a/imagetool/src/main/resources/probe-env/inspect-image-long.sh b/imagetool/src/main/resources/probe-env/inspect-image-long.sh index 74e051196..65747043f 100644 --- a/imagetool/src/main/resources/probe-env/inspect-image-long.sh +++ b/imagetool/src/main/resources/probe-env/inspect-image-long.sh @@ -84,6 +84,7 @@ if [ -n "$ORACLE_HOME" ]; then echo oracleInstalledProducts="$(awk -F\" '{ORS=","} /product-family/ { print $2 }' "$ORACLE_HOME"/inventory/registry.xml | sed 's/,$//')" fi +echo __OS__arch="$(uname -m)" 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 '')" diff --git a/imagetool/src/main/resources/probe-env/inspect-image.sh b/imagetool/src/main/resources/probe-env/inspect-image.sh index 2fe3211f7..0444841c6 100644 --- a/imagetool/src/main/resources/probe-env/inspect-image.sh +++ b/imagetool/src/main/resources/probe-env/inspect-image.sh @@ -64,6 +64,7 @@ if [ -n "$ORACLE_HOME" ]; then echo oracleInstalledProducts="$(awk -F\" '{ORS=","} /product-family/ { print $2 }' "$ORACLE_HOME"/inventory/registry.xml | sed 's/,$//')" fi +echo __OS__arch="$(uname -m)" 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 '')" diff --git a/imagetool/src/test/resources/inspect/image1.json b/imagetool/src/test/resources/inspect/image1.json index 641bafcfb..f685efc6b 100644 --- a/imagetool/src/test/resources/inspect/image1.json +++ b/imagetool/src/test/resources/inspect/image1.json @@ -24,7 +24,8 @@ "os" : { "id" : "ol", "name" : "Oracle Linux Server", - "version" : "7.9" + "version" : "7.9", + "architecture" : "x86_64" }, "javaHome" : "/u01/jdk", "javaVersion" : "1.8.0_202", diff --git a/imagetool/src/test/resources/inspect/image1.properties b/imagetool/src/test/resources/inspect/image1.properties index cca6adc7d..46fd2c6c7 100644 --- a/imagetool/src/test/resources/inspect/image1.properties +++ b/imagetool/src/test/resources/inspect/image1.properties @@ -12,4 +12,5 @@ wlsVersion=12.2.1.3.0 javaHome=/u01/jdk __OS__NAME="Oracle Linux Server" __OS__VERSION="7.9" -__OS__ID="ol" \ No newline at end of file +__OS__ID="ol" +__OS__arch=x86_64 diff --git a/imagetool/src/test/resources/inspect/image2.json b/imagetool/src/test/resources/inspect/image2.json index 83d3946b8..4c548e075 100644 --- a/imagetool/src/test/resources/inspect/image2.json +++ b/imagetool/src/test/resources/inspect/image2.json @@ -4,7 +4,8 @@ "os" : { "id" : "ol", "name" : "Oracle Linux Server", - "version" : "7.9" + "version" : "7.9", + "architecture" : "x86_64" }, "domainHome" : "/u01/domains/base_domain", "javaHome" : "/u01/jdk", diff --git a/imagetool/src/test/resources/inspect/image2.properties b/imagetool/src/test/resources/inspect/image2.properties index cb087ce25..dc91b6523 100644 --- a/imagetool/src/test/resources/inspect/image2.properties +++ b/imagetool/src/test/resources/inspect/image2.properties @@ -13,4 +13,5 @@ wlsVersion=12.2.1.4.0 javaHome=/u01/jdk __OS__NAME="Oracle Linux Server" __OS__VERSION="7.9" -__OS__ID="ol" \ No newline at end of file +__OS__ID="ol" +__OS__arch=x86_64 diff --git a/imagetool/src/test/resources/inspect/image3.json b/imagetool/src/test/resources/inspect/image3.json index 2fdf2c22a..66d3707ed 100644 --- a/imagetool/src/test/resources/inspect/image3.json +++ b/imagetool/src/test/resources/inspect/image3.json @@ -5,6 +5,7 @@ "id" : "ol", "name" : "Oracle Linux Server", "version" : "7.9", + "architecture" : "x86_64", "releasePackage" : "oraclelinux-release-7.9-1.0.7.el8.x86_64" }, "domainHome" : "/u01/domains/base_domain", diff --git a/imagetool/src/test/resources/inspect/image3.properties b/imagetool/src/test/resources/inspect/image3.properties index 633488e68..b0d6cf8d4 100644 --- a/imagetool/src/test/resources/inspect/image3.properties +++ b/imagetool/src/test/resources/inspect/image3.properties @@ -15,3 +15,4 @@ __OS__NAME="Oracle Linux Server" __OS__VERSION="7.9" __OS__ID="ol" __OS__RELEASE_PACKAGE="oraclelinux-release-7.9-1.0.7.el8.x86_64" +__OS__arch=x86_64