Skip to content

Commit 5ac7e14

Browse files
Merge branch 'main' into fork-main-logging
2 parents 5efeaa8 + f1a077b commit 5ac7e14

69 files changed

Lines changed: 2366 additions & 621 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/actions/clp-build-runtime-image/action.yaml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,14 @@ inputs:
1414
default: ""
1515
description: "Container image registry password"
1616
required: false
17-
platform_id:
18-
description: "Platform ID of the container (e.g. ubuntu)"
19-
required: false
20-
platform_version_id:
21-
description: "Platform VERSION_ID / VERSION_CODENAME of the container
22-
(e.g. jammy, focal, etc.)"
23-
required: false
2417
arch:
2518
description: "Target architecture (amd64 or arm64)"
2619
default: "amd64"
2720
required: false
21+
platform_version_codename:
22+
description: >-
23+
Platform version codename (e.g. jammy, noble) used as the runtime image base version.
24+
required: true
2825

2926
runs:
3027
using: "composite"
@@ -94,3 +91,5 @@ runs:
9491
push: true
9592
tags: "${{steps.extract-gh-meta.outputs.tags}}"
9693
labels: "${{steps.extract-gh-meta.outputs.labels}}"
94+
build-args: |
95+
UBUNTU_VERSION_CODENAME=${{inputs.platform_version_codename}}

.github/workflows/clp-artifact-build.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -739,6 +739,7 @@ jobs:
739739
image_registry_username: "${{github.actor}}"
740740
image_registry_password: "${{secrets.GITHUB_TOKEN}}"
741741
arch: "${{matrix.arch}}"
742+
platform_version_codename: "jammy"
742743

743744
package-image-multiarch-manifest:
744745
name: "package-image-multiarch-manifest"

0 commit comments

Comments
 (0)