Skip to content

Commit

Permalink
chore: follow-up of UBI9 image introduction
Browse files Browse the repository at this point in the history
  • Loading branch information
lemeurherveCB committed Sep 24, 2024
1 parent 5b26913 commit cc27984
Show file tree
Hide file tree
Showing 3 changed files with 87 additions and 7 deletions.
20 changes: 19 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
]
}
},
Expand Down
19 changes: 13 additions & 6 deletions docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ group "linux" {
targets = [
"agent_archlinux_jdk11",
"alpine",
"debian"
"debian",
"rhel_ubi9"
]
}

Expand All @@ -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"
]
}

Expand All @@ -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"
]
}

Expand All @@ -59,7 +65,8 @@ group "linux-s390x" {

group "linux-ppc64le" {
targets = [
"debian"
"debian",
"rhel_ubi9"
]
}

Expand Down Expand Up @@ -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}"
Expand Down
55 changes: 55 additions & 0 deletions updatecli/updatecli.d/rhel-ubi9.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
---
name: Bump UBI9 version

scms:
default:
kind: github
spec:
user: "{{ .github.user }}"
email: "{{ .github.email }}"
owner: "{{ .github.owner }}"
repository: "{{ .github.repository }}"
token: "{{ requiredEnv .github.token }}"
username: "{{ .github.username }}"
branch: "{{ .github.branch }}"

sources:
latestVersion:
kind: dockerimage
name: "Get the latest UBI9 Linux version"
spec:
image: "registry.access.redhat.com/ubi9/ubi"
versionfilter:
kind: semver
transformers:
- trimsuffix: "-source"

targets:
updateDockerfile:
name: "Update the value of the base image (ARG UBI9_TAG) in the Dockerfile"
kind: dockerfile
sourceid: latestVersion
spec:
file: rhel/ubi9/Dockerfile
instruction:
keyword: "ARG"
matcher: "UBI9_TAG"
scmid: default
updateDockerBake:
name: "Update the default value of the variable UBI9_TAG in the docker-bake.hcl"
kind: hcl
sourceid: latestVersion
spec:
file: docker-bake.hcl
path: variable.UBI9_TAG.default
scmid: default

actions:
default:
kind: github/pullrequest
scmid: default
title: Bump UBI9 version to {{ source "latestVersion" }}
spec:
labels:
- dependencies
- rhel-ubi9

0 comments on commit cc27984

Please sign in to comment.