Merge pull request #1020 from SUSE/tomcat10_java

We need to build SP6 tomcat containers with Java 21, 11 was dropped
SUSE · Apr 12, 2024 · fdd5ade · fdd5ade
2 parents 3e96ac3 + 1d30da0
commit fdd5ade
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/bci_build/package/appcontainers.py b/src/bci_build/package/appcontainers.py
@@ -683,7 +683,8 @@ def _get_nginx_kwargs(os_version: OsVersion):
                 if tomcat_major == _TOMCAT_VERSIONS[0]
                 else f"tomcat{tomcat_major}"
             )
-        ],
+        ]
+        + (["java-21-openjdk-headless"] if os_version == OsVersion.SP6 else []),
         replacements_via_service=[
             Replacement(
                 regex_in_build_description="%%tomcat_version%%", package_name=tomcat_pkg