Docker SSI: add alma linux (#3125)

DataDog · Sep 26, 2024 · 2053e56 · 2053e56
1 parent da17bd1
commit 2053e56
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/utils/build/ssi/base/install_os_deps.sh b/utils/build/ssi/base/install_os_deps.sh
@@ -6,7 +6,8 @@ if [[ "$(cat /etc/redhat-release || true)" == "Red Hat Enterprise Linux release
     OS="RedHat_8"
 elif [[ "$(cat /etc/redhat-release || true)" == "Red Hat Enterprise Linux release 9."* ]]; then
     OS="RedHat_9"
-#elif [[ "$(cat /etc/redhat-release || true)" == "CentOS Linux release 7.9.2009 (AltArch)" ]]; then
+elif [[ "$(cat /etc/redhat-release || true)" == "AlmaLinux release"* ]]; then
+    OS="RedHat_9"
 elif [[ "$(cat /etc/redhat-release || true)" == "CentOS Linux release 7.8.2003 (Core)" ]]; then
     OS="RedHat_Centos_7_8"
 elif [ -f /etc/debian_version ] || [ "$DISTRIBUTION" = "Debian" ] || [ "$DISTRIBUTION" = "Ubuntu" ]; then
@@ -25,6 +26,7 @@ elif [ -f /etc/SuSE-release ] || [ "$DISTRIBUTION" = "SUSE" ] || [ "$DISTRIBUTIO
 elif [ -f /etc/alpine-release ]; then
     OS="Alpine"
 fi
+echo "SELECTED OS: $OS"
 if [ "$OS" = "RedHat_8" ] || [ "$OS" = "RedHat_9" ]; then
     if ! command -v yum &> /dev/null
     then

diff --git a/utils/docker_ssi/docker_ssi_definitions.py b/utils/docker_ssi/docker_ssi_definitions.py
@@ -22,6 +22,11 @@ def __init__(self) -> None:
         self.ORACLELINUX_8_ARM64 = DockerImage("oraclelinux:8.10", LINUX_ARM64)
         self.ORACLELINUX_8_AMD64 = DockerImage("oraclelinux:8.10", LINUX_AMD64)
 
+        self.ALMALINUX_9_ARM64 = DockerImage("almalinux:9.4", LINUX_ARM64)
+        self.ALMALINUX_9_AMD64 = DockerImage("almalinux:9.4", LINUX_AMD64)
+        self.ALMALINUX_8_ARM64 = DockerImage("almalinux:8.10", LINUX_ARM64)
+        self.ALMALINUX_8_AMD64 = DockerImage("almalinux:8.10", LINUX_AMD64)
+
         # Currently bugged
         # DockerImage("centos:7", LINUX_ARM64, short_name="centos_7")
         # DockerImage("alpine:3", LINUX_AMD64, short_name="alpine_3"),
@@ -87,13 +92,26 @@ def get_version_id(version):
         SupportedImages().ORACLELINUX_8_ARM64.with_allowed_runtime_versions(
             JavaRuntimeInstallableVersions.get_all_versions()
         ),
+        SupportedImages().ALMALINUX_9_AMD64.with_allowed_runtime_versions(
+            JavaRuntimeInstallableVersions.get_all_versions()
+        ),
+        SupportedImages().ALMALINUX_9_ARM64.with_allowed_runtime_versions(
+            JavaRuntimeInstallableVersions.get_all_versions()
+        ),
+        SupportedImages().ALMALINUX_8_AMD64.with_allowed_runtime_versions(
+            JavaRuntimeInstallableVersions.get_all_versions()
+        ),
+        SupportedImages().ALMALINUX_8_ARM64.with_allowed_runtime_versions(
+            JavaRuntimeInstallableVersions.get_all_versions()
+        ),
         # Commented due to APMON-1491
         # SupportedImages().CENTOS_7_AMD64.with_allowed_runtime_versions(
         #    JavaRuntimeInstallableVersions.get_all_versions()
         # ),
     ],
 )
 
+
 TOMCAT_APP = WeblogDescriptor("tomcat-app", "java", [SupportedImages().TOMCAT_9_ARM64])
 JAVA7_APP = WeblogDescriptor("java7-app", "java", [SupportedImages().UBUNTU_22_ARM64])
 WEBSPHERE_APP = WeblogDescriptor("websphere-app", "java", [SupportedImages().WEBSPHERE_AMD64])