Merge branch 'main' into extend-report-toml

text/0096-remove-stacks-mixins.md

@@ -41,19 +41,19 @@ Instead of a stack ID, runtime and build-time base images must contain the follo
 - OS (e.g., "linux", `$GOOS`), specified as `os` in the base image `config` 
 - Architecture (e.g., "arm", `$GOARCH`), specified as `architecture` in the base image `config`
 - Architecture Variant (optional) (e.g., "v6", `$GOARM`), specified as `variant` in the base image `config`
-- Distribution (optional) (e.g., "ubuntu", `$ID`), specified as a label `io.buildpacks.distribution.name`
-- Version (optional) (e.g., "18.04", `$VERSION_ID`), specified as a label `io.buildpacks.distribution.version`
+- Distribution (optional) (e.g., "ubuntu", `$ID`), specified as a label `io.buildpacks.base.distro.name`
+- Version (optional) (e.g., "18.04", `$VERSION_ID`), specified as a label `io.buildpacks.base.distro.version`
 
 Additionally, the runtime base may contain the following metadata:
-- Target ID (optional) (e.g., "minimal"), specified as a label `io.buildpacks.id`
+- Target ID (optional) (e.g., "minimal"), specified as a label `io.buildpacks.base.id`
 
 OS, Architecture, and Architecture Variant must be valid identifiers as defined in the [OCI Image specification](https://github.com/opencontainers/image-spec/blob/main/config.md).
 
 Target ID is an identifier specified on the runtime base image that must be provided to buildpacks as `CNB_TARGET_ID` during the build process.
 This allows buildpacks to change their behavior if a run image is selected (e.g., distroless) that has special properties outside of OS, architecture, etc.
 
 For Linux-based images, each field should be canonicalized against values specified in `/etc/os-release` (`$ID` and `$VERSION_ID`).
-The `os.version` field in an base image `config` may contain combined distribution and version information, but it is not used by the lifecycle.
+The `os.version` field in a base image `config` may contain combined distribution and version information, but it is not used by the lifecycle.
 
 For Windows-based images, Distribution should be empty. Version should be the [suggested value of `os.version`](https://github.com/opencontainers/image-spec/blob/main/config.md#properties) in the OCI spec (e.g., `10.0.14393.1066`).
 
@@ -81,17 +81,17 @@ versions = ["18.04", "20.04"]
 [[targets]]
 os = "linux"
 arch = "amd64"
-[[targets.distributions]]
+[[targets.distros]]
 name = "ubuntu"
-versions = ["14.04", "16.04"]
+version = "16.04"
 
 [[targets]]
 os = "linux"
 arch = "arm"
 variant = "v6"
-[[targets.distributions]]
+[[targets.distros]]
 name = "ubuntu"
-versions = ["14.04", "16.04"]
+version = "16.04"
 ```
 
 ## Runtime Metadata
@@ -153,11 +153,11 @@ If the newly-specified field values are missing, the lifecycle and pack may used
 ```
 config.os = "linux"
 config.architecture = "amd64"
-io.buildpacks.distribution.name = "ubuntu"
-io.buildpacks.distribution.version = "18.04"
+io.buildpacks.base.distro.name = "ubuntu"
+io.buildpacks.base.distro.version = "18.04"
 ```
 
-Moving forward it's encouraged for buildpack authors to support both `[[stacks]]` and `[[targets]]` sections in `buildpack.toml` for maximum compatibility. In order to ease this process for those using the `io.buildpacks.stacks.bionic`, lifecycle will translate any section that sets this as on of the `stacks`:
+Moving forward it's encouraged for buildpack authors to support both `[[stacks]]` and `[[targets]]` sections in `buildpack.toml` for maximum compatibility. In order to ease this process for those using the `io.buildpacks.stacks.bionic`, lifecycle will translate any section that sets this as one of the `stacks`:
 
 ```toml
 [[stacks]]
@@ -170,7 +170,7 @@ to
 [[targets]]
 os = "linux"
 arch = "amd64"
-[[targets.distributions]]
+[[targets.distros]]
 name = "ubuntu"
 versions = ["18.04"]
 ```
@@ -210,3 +210,23 @@ rename x86_64 -> amd64 in keeping with all other usages of arch. descriptors.
 ### Motivation
 
 This is how we do it everywhere else, this is the way.
+
+## Amended
+### Meta
+[meta-1]: #meta-1
+- Name: Rename Docker labels and `buildpack.toml` table names
+- Start Date: 2024-04-08
+- Author(s): @edmorley
+- Amendment Pull Request: [rfcs#310](https://github.com/buildpacks/rfcs/pull/310)
+
+### Summary
+
+Changes were made to the Docker label and `buildpack.toml` table names between when this RFC was written and the changes were made to the spec in [spec#365](https://github.com/buildpacks/spec/pull/365), which have now been backported to the RFC:
+
+- The `io.buildpacks.distributions.*` Docker labels were renamed to `io.buildpacks.base.distro.*`.
+- The `io.buildpacks.id` Docker label was renamed to `io.buildpacks.base.id`.
+- The `buildpack.toml` table `[[targets.distributions]]` was renamed to `[[targets.distros]]` and the `versions` field within it renamed to `version` (along with its type changing from an array to a string).
+
+### Motivation
+
+To prevent use of the wrong Docker label or `buildpack.toml` table names, if users base their implementations on the RFC rather than reading the spec.

text/0128-multiarch-builders-and-package.md

@@ -95,9 +95,9 @@ arch = "arm64"
 os = "windows"
 arch = "amd64"
 
-[[targets.distributions]]
+[[targets.distros]]
 name = "windows"
-versions = ["10.0.20348.1970"]
+version = "10.0.20348.1970"
 
 # Stacks (deprecated) the buildpack will work with
 [[stacks]]
@@ -286,9 +286,9 @@ variant = "<architecture variant>"
 # optional
 path = "<path to look for the binaries if the folder structure convention is not followed>" 
 
-[[targets.distributions]]
+[[targets.distros]]
 name = "<distribution ID>"
-versions = ["<distribution version>"]
+version = "<distribution version>"
 ```
 - When `more than 1 target is defined`
   - When `--publish` is specified
@@ -681,9 +681,9 @@ arch = "arm64"
 os = "windows"
 arch = "amd64"
 
-[[targets.distributions]]
+[[targets.distros]]
 name = "windows"
-versions = ["10.0.20348.1970"]
+version = "10.0.20348.1970"
 
 # Stacks (deprecated) the buildpack will work with
 [[stacks]]
@@ -763,9 +763,9 @@ os = "<operating system>"
 arch = "<system architecture>"
 variant = "<architecture variant>"
 
-[[targets.distributions]]
+[[targets.distros]]
 name = "<distribution ID>"
-versions = ["<distribution version>"]
+version = "<distribution version>"
 
 [[dependencies]]
 uri = "<A URL or path to an archive, a packaged buildpack (saved as a .cnb file), or a directory. If path is relative, it must be relative to the package.toml>"
@@ -843,9 +843,9 @@ image = "<build image reference>"
 os = "<operating system>"
 arch = "<system architecture>"
 variant = "<architecture variant>"
-[[targets.distributions]]
+[[targets.distros]]
 name = "<distribution ID>"
-versions = ["<distribution version>"]
+version = "<distribution version>"
 ```
 - Add a new `--target` optional flag with format `[os][/arch][/variant]:[name@version]` to create a builder for a 
 particular target, this will help end-users to specify the platform for which they want to create single OCI artifact.