Skip to content

feat(images): add explicit per-image architectures #18778

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
binujp wants to merge 1 commit into
base: 4.0
Choose a base branch
from
+21 −0
Draft

feat(images): add explicit per-image architectures #18778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions base/images/images.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
[images.vm-base]
description = "VM Base Image"
definition = { type = "kiwi", path = "AzureLinux.kiwi", profile = "vm-base" }
architectures = ["x86_64", "aarch64"]
Comment thread
binujp marked this conversation as resolved.
tests.tests = [
{ name = "static-image-checks" },
{ group = "vm-base-functional" },
Expand All @@ -31,6 +32,7 @@ runtime-package-management = true
[images.container-base]
description = "Container Base Image"
definition = { type = "kiwi", path = "AzureLinux.kiwi", profile = "core" }
architectures = ["x86_64", "aarch64"]
tests.tests = [
{ name = "static-image-checks" },
{ name = "runtime-container-tests" },
Expand All @@ -45,6 +47,7 @@ runtime-package-management = true
[images.container-distroless-minimal]
description = "Container Distroless Minimal Image"
definition = { type = "kiwi", path = "AzureLinux.kiwi", profile = "distroless-minimal" }
architectures = ["x86_64", "aarch64"]
tests.tests = [{ name = "static-image-checks" }]

[images.container-distroless-minimal.capabilities]
Expand All @@ -56,6 +59,7 @@ runtime-package-management = false
[images.container-distroless-base]
description = "Container Distroless Base Image"
definition = { type = "kiwi", path = "AzureLinux.kiwi", profile = "distroless-base" }
architectures = ["x86_64", "aarch64"]
tests.tests = [{ name = "static-image-checks" }]

[images.container-distroless-base.capabilities]
Expand All @@ -67,6 +71,7 @@ runtime-package-management = false
[images.container-distroless-debug]
description = "Container Distroless Debug Image"
definition = { type = "kiwi", path = "AzureLinux.kiwi", profile = "distroless-debug" }
architectures = ["x86_64", "aarch64"]
tests.tests = [{ name = "static-image-checks" }]

[images.container-distroless-debug.capabilities]
Expand All @@ -80,6 +85,7 @@ runtime-package-management = false
[images.wsl]
description = "WSL Image"
definition = { type = "kiwi", path = "AzureLinux.kiwi", profile = "wsl" }
architectures = ["x86_64", "aarch64"]
tests.tests = [{ name = "static-image-checks" }]

[images.wsl.capabilities]
Expand All @@ -92,6 +98,7 @@ wsl = true
[images.vm-iso-installer]
description = "VM ISO Installer"
definition = { type = "kiwi", path = "vm-iso-installer/vm-iso-installer.kiwi", profile = "vm-iso-installer" }
architectures = ["x86_64", "aarch64"]
tests.tests = [{ name = "iso-install" }]

[images.vm-iso-installer.capabilities]
Expand All @@ -100,6 +107,7 @@ installer-media = true
[images.minimal-os]
description = "Minimal OS Image"
definition = { type = "kiwi", path = "AzureLinux.kiwi", profile = "minimal-os" }
architectures = ["x86_64", "aarch64"]
tests.tests = [{ name = "static-image-checks" }]

[images.minimal-os.capabilities]
Expand All @@ -111,6 +119,7 @@ runtime-package-management = true
[images.1p-vm-base-gen1]
description = "1P VM Base Gen1 Image (BIOS)"
definition = { type = "kiwi", path = "AzureLinux.kiwi", profile = "1p-vm-base-gen1" }
architectures = ["x86_64"]
tests.tests = [
{ name = "static-image-checks" },
{ group = "vm-base-functional" },
Expand All @@ -126,6 +135,7 @@ runtime-package-management = true
[images.1p-vm-base-gen1-fips]
description = "1P VM Base Gen1 FIPS Image (BIOS)"
definition = { type = "kiwi", path = "AzureLinux.kiwi", profile = "1p-vm-base-gen1-fips" }
architectures = ["x86_64"]
tests.tests = [
{ name = "static-image-checks" },
{ group = "vm-base-functional" },
Expand All @@ -142,6 +152,7 @@ fips-enabled = true
[images.1p-vm-base-gen2-fips]
description = "1P VM Base Gen2 FIPS Image (UEFI)"
definition = { type = "kiwi", path = "AzureLinux.kiwi", profile = "1p-vm-base-gen2-fips" }
architectures = ["x86_64", "aarch64"]
tests.tests = [
{ name = "static-image-checks" },
{ group = "vm-base-functional" },
Expand All @@ -158,6 +169,7 @@ fips-enabled = true
[images.marketplace-gen2]
description = "Marketplace Gen2 Image"
definition = { type = "kiwi", path = "AzureLinux.kiwi", profile = "marketplace-gen2" }
architectures = ["x86_64", "aarch64"]
tests.tests = [
{ name = "static-image-checks" },
{ group = "vm-base-functional" },
Expand All @@ -173,6 +185,7 @@ runtime-package-management = true
[images.marketplace-gen2-fips]
description = "Marketplace Gen2 FIPS Image"
definition = { type = "kiwi", path = "AzureLinux.kiwi", profile = "marketplace-gen2-fips" }
architectures = ["x86_64", "aarch64"]
tests.tests = [
{ name = "static-image-checks" },
{ group = "vm-base-functional" },
Expand Down
8 changes: 8 additions & 0 deletions external/schemas/azldev.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,6 +729,14 @@
"$ref": "#/$defs/ImagePublishConfig",
"title": "Publish settings",
"description": "Publishing settings for this image"
},
"architectures": {
"items": {
"type": "string"
},
"type": "array",
"title": "Architectures",
"description": "Architectures supported by this image (optional during repository migration; no project-wide default)"
}
},
"additionalProperties": false,
Expand Down
Loading