From 72ad5509e4aebedfc5337dcc17b11a7b0a6b86af Mon Sep 17 00:00:00 2001 From: Ed Morley <501702+edmorley@users.noreply.github.com> Date: Mon, 8 Apr 2024 16:14:42 +0100 Subject: [PATCH] Correct name of `distros.version` field in `buildpack.toml` The correct name for the field is `distros.version` (singular), rather than `distros.versions`. The former is what is used elsewhere in the spec, and in the lifecycle implementation. The plural form looks like a leftover from the rename in: https://github.com/buildpacks/spec/commit/8652ec5e492998e0233c7778b7217d8433f16663 Fixes #401. Backport of #402. Signed-off-by: Ed Morley <501702+edmorley@users.noreply.github.com> --- buildpack.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildpack.md b/buildpack.md index 35f2f07..218858d 100644 --- a/buildpack.md +++ b/buildpack.md @@ -1108,8 +1108,8 @@ Each target in `targets`: - MUST identify a compatible runtime environment: - `os`, `arch`, and `variant` if provided MUST be valid identifiers as defined in the [OCI Image Specification](https://github.com/opencontainers/image-spec/blob/main/config.md) - `distros` if provided MUST describe the OS distributions supported by the buildpack - - For Linux-based images, `distros.name` and `distros.versions` SHOULD contain the values specified in `/etc/os-release` (`$ID` and `$VERSION_ID`), as the `os.version` field in an image config may contain combined distribution and version information - - For Windows-based images, `distros.name` SHOULD be empty; `distros.versions` SHOULD contain the value of `os.version` in the image config (e.g., `10.0.14393.1066`) + - For Linux-based images, `distros.name` and `distros.version` SHOULD contain the values specified in `/etc/os-release` (`$ID` and `$VERSION_ID`), as the `os.version` field in an image config may contain combined distribution and version information + - For Windows-based images, `distros.name` SHOULD be empty; `distros.version` SHOULD contain the value of `os.version` in the image config (e.g., `10.0.14393.1066`) - Any field not provided will be interpreted as `` If the `targets` list is empty, tools reading `buildpack.toml` will assume: