Merge pull request #880 from lemeurherveCB/ubi9-follow-up

chore: follow-up of UBI9 image introduction
jenkinsci · Sep 24, 2024 · f56a0cc · f56a0cc
2 parents 5b26913 + ea74257
commit f56a0cc
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -30,14 +30,23 @@ If you want to see the target images (matching your current architecture) that w
 
 ```bash
 $ make list
+agent_alpine_jdk11
+agent_alpine_jdk17
 agent_alpine_jdk21
+agent_archlinux_jdk11
 agent_debian_jdk11
 agent_debian_jdk17
 agent_debian_jdk21
+agent_rhel_ubi9_jdk17
+agent_rhel_ubi9_jdk21
+inbound-agent_alpine_jdk11
+inbound-agent_alpine_jdk17
 inbound-agent_alpine_jdk21
 inbound-agent_debian_jdk11
 inbound-agent_debian_jdk17
 inbound-agent_debian_jdk21
+inbound-agent_rhel_ubi9_jdk17
+inbound-agent_rhel_ubi9_jdk21
 ```
 
 #### Building a specific image
@@ -128,7 +137,16 @@ $ make show
       "targets": [
         "agent_archlinux_jdk11",
         "alpine",
-        "debian"
+        "debian",
+        "rhel_ubi9"
+      ]
+    },
+    "rhel_ubi9": {
+      "targets": [
+        "agent_rhel_ubi9_jdk17",
+        "agent_rhel_ubi9_jdk21",
+        "inbound-agent_rhel_ubi9_jdk17",
+        "inbound-agent_rhel_ubi9_jdk21"
       ]
     }
   },

diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -2,7 +2,8 @@ group "linux" {
   targets = [
     "agent_archlinux_jdk11",
     "alpine",
-    "debian"
+    "debian",
+    "rhel_ubi9"
   ]
 }
 
@@ -21,7 +22,9 @@ group "linux-agent-only" {
     "agent_alpine_jdk21",
     "agent_debian_jdk11",
     "agent_debian_jdk17",
-    "agent_debian_jdk21"
+    "agent_debian_jdk21",
+    "agent_rhel_ubi9_jdk17",
+    "agent_rhel_ubi9_jdk21"
   ]
 }
 
@@ -32,14 +35,17 @@ group "linux-inbound-agent-only" {
     "inbound-agent_alpine_jdk21",
     "inbound-agent_debian_jdk11",
     "inbound-agent_debian_jdk17",
-    "inbound-agent_debian_jdk21"
+    "inbound-agent_debian_jdk21",
+    "inbound-agent_rhel_ubi9_jdk17",
+    "inbound-agent_rhel_ubi9_jdk21"
   ]
 }
 
 group "linux-arm64" {
   targets = [
-    "debian",
     "alpine_jdk21",
+    "debian",
+    "rhel_ubi9"
   ]
 }
 
@@ -59,7 +65,8 @@ group "linux-s390x" {
 
 group "linux-ppc64le" {
   targets = [
-    "debian"
+    "debian",
+    "rhel_ubi9"
   ]
 }
 
@@ -306,7 +313,7 @@ target "agent_archlinux_jdk11" {
 
 target "rhel_ubi9" {
   matrix = {
-    type = ["agent", "inbound-agent"]
+    type = agent_types_to_build
     jdk  = [17, 21]
   }
   name       = "${type}_rhel_ubi9_jdk${jdk}"