Merge branch 'main' into enhancement/issue-529-document-export-to-oci-layout

Author: jjbustamante

.github/workflows/main.yml

@@ -18,15 +18,15 @@ jobs:
       - name: Git Checkout
         uses: actions/checkout@v3
       - name: Setup Go environment
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
           go-version: '1.x'
       - name: Install Dependencies
         run: sudo apt-get install make curl jq
       - name: Install pack
-        uses: buildpacks/github-actions/setup-pack@v5.0.1
+        uses: buildpacks/github-actions/setup-pack@v5.2.0
         with:
-          pack-version: '0.28.0'
+          pack-version: '0.30.0-rc1' # FIXME: update to 0.30.0 when available
       - name: Test
         run: make test
         env:

content/docs/app-developer-guide/run-an-app.md

@@ -50,6 +50,8 @@ Base Image:
 Run Images:
   cnbs/sample-stack-run:alpine
 
+Rebasable: true
+
 Buildpacks:
   ID                             VERSION           HOMEPAGE
   samples/java-maven             0.0.1             https://github.com/buildpacks/samples/tree/main/buildpacks/java-maven

content/docs/app-developer-guide/specify-buildpacks.md

@@ -9,14 +9,14 @@ summary="Learn how to specify exactly what buildpacks are used during the build
 
 You may specify exactly what buildpacks are used during the build process by referencing them with a URI in any of the following formats.
 
-| Type | Format |
-|----- |------- |
-| Relative | `<path>` |
-| Filesystem | `file://[<host>]/<path>` |
-| URL | `http[s]://<host>/<path>` |
-| Docker | `docker://[<host>]/<path>[:<tag>⏐@<digest>]` |
-| CNB Builder Resource | `urn:cnb:builder[:<id>[@<version>]]` |
-| CNB Registry Resource | `urn:cnb:registry[:<id>[@<version>]]` |
+| Type                  | Format                                       |
+| --------------------- | -------------------------------------------- |
+| Relative              | `<path>`                                     |
+| Filesystem            | `file://[<host>]/<path>`                     |
+| URL                   | `http[s]://<host>/<path>`                    |
+| Docker                | `docker://[<host>]/<path>[:<tag>⏐@<digest>]` |
+| CNB Builder Resource  | `urn:cnb:builder[:<id>[@<version>]]`         |
+| CNB Registry Resource | `urn:cnb:registry[:<id>[@<version>]]`        |
 
 ##### Fallback Behavior
 
@@ -60,7 +60,7 @@ The [`project.toml`][project-toml] format allows for Buildpack URIs to be specif
 
 ```toml
 [_]
-schema-version = "0.3"
+schema-version = "0.2"
 id = "sample-java-maven-app"
 name = "Sample Java App"
 version = "1.0.0"

content/docs/app-developer-guide/using-cache-image.md

@@ -85,4 +85,12 @@ pack build localhost:5000/buildpack-examples/second-cache-image-example \
 ```
 <!--+- "{{execute}}"+-->
 
+### Image Retention
+
+Managing the lifecycle of images should be the responsibility of the owner, as `the platform does not automatically clean up old images from the registry`.   
+You can refer to your registry's documentation to learn how to accomplish this.   
+* [AWS ECR](https://aws.amazon.com/ecr/) users can find information on how to delete images in the AWS ECR documentation, specifically in the section on [image deletion](https://docs.aws.amazon.com/AmazonECR/latest/userguide/delete_image.html).
+* [Docker](https://docs.docker.com/engine/) users can consult the Docker documentation on [Advanced Image Management](https://docs.docker.com/docker-hub/image-management/) to find out how to delete images.
+
+
 [samples]: https://github.com/buildpack/samples

content/docs/app-developer-guide/using-inline-buildpacks.md

@@ -37,7 +37,7 @@ Inline buildpacks aren't constrained to a single command, however. You can defin
 [[io.buildpacks.group]]
 id = "me/cleanup"
 
-  [io.buildpacks.script]
+  [io.buildpacks.group.script]
   api = "0.9"
   inline = """
 set -e

content/docs/app-developer-guide/using-project-descriptor.md

@@ -20,6 +20,7 @@ file at the root of the application. For more on `gitignore` matching see [these
 
 ```toml
 [_]
+schema-version = "0.2"
 id = "io.buildpacks.bash-script"
 name = "Bash Script"
 version = "1.0.0"
@@ -68,6 +69,7 @@ Below is an expanded `project.toml`, with an additional buildpack and environmen
 
 ```toml
 [_]
+schema-version = "0.2"
 id = "io.buildpacks.bash-script"
 name = "Bash Script"
 version = "1.0.0"

content/docs/buildpack-author-guide/create-buildpack/adding-bill-of-materials.md

@@ -10,6 +10,7 @@ One of the benefits of buildpacks is they can also populate the app image with m
 * The process types that are available and the commands associated with them
 * The run-image the app image was based on
 * The buildpacks were used to create the app image
+* Whether the run-image can be rebased with a new version through the `Rebasable` label or not
 * And more...!
 
 You can find some of this information using `pack` via its `inspect-image` command.  The bill-of-materials information will be available using `pack sbom download`.
@@ -21,10 +22,11 @@ pack inspect-image test-ruby-app
 <!--+- "{{execute}}"+-->
 You should see the following:
 
-<!-- test:assert=contains -->
+<!-- test:assert=contains;ignore-lines=... -->
 ```text
 Run Images:
   cnbs/sample-stack-run:jammy
+...
 
 Buildpacks:
   ID                   VERSION        HOMEPAGE

content/docs/buildpack-author-guide/create-buildpack/building-blocks-cnb.md

@@ -116,10 +116,12 @@ The `pack build` command takes in your Ruby sample app as the `--path` argument
 
 After running the command, you should see that it failed to detect, as the `detect` script is currently written to simply error out.
 
-<!-- test:assert=contains -->
+<!-- test:assert=contains;ignore-lines=... -->
 ```
 ===> DETECTING
+...
 err:  examples/[email protected] (1)
+...
 ERROR: No buildpack groups passed detection.
 ERROR: failed to detect: buildpack(s) failed with err
 ```

content/docs/buildpack-author-guide/create-buildpack/caching.md

@@ -256,6 +256,7 @@ it will download the gems:
 <!-- test:assert=contains;ignore-lines=... -->
 ```text
 ===> BUILDING
+...
 ---> Ruby Buildpack
 ---> Downloading and extracting Ruby
 ---> Installing gems
@@ -274,6 +275,7 @@ you will see the new caching logic at work during the `BUILDING` phase:
 <!-- test:assert=contains;ignore-lines=... -->
 ```text
 ===> BUILDING
+...
 ---> Ruby Buildpack
 ---> Downloading and extracting Ruby
 ---> Reusing gems

content/docs/buildpack-author-guide/create-buildpack/make-buildpack-configurable.md

@@ -126,9 +126,10 @@ pack build test-ruby-app --path ./ruby-sample-app --buildpack ./ruby-buildpack
 
 You will notice that version of Ruby specified in the app's `.ruby-version` file is downloaded.
 
-<!-- test:assert=contains -->
+<!-- test:assert=contains;ignore-lines=... -->
 ```text
 ===> BUILDING
+...
 ---> Ruby Buildpack
 ---> Downloading and extracting Ruby 3.1.0
 ```