Merge branch 'main' into runext/demo

Author: Natalie Arellano

.github/workflows/main.yml

@@ -24,7 +24,7 @@ jobs:
       - 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'
       - name: Test

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

@@ -54,24 +54,25 @@ pack build sample-java-maven-app \
 
 ## Using a Project Descriptor
 
-The [`project.toml`][project-toml] format allows for Buildpack URIs to be specified in the `[[build.buildpacks]]` table with the `uri` key.
+The [`project.toml`][project-toml] format allows for Buildpack URIs to be specified in the `[[io.buildpacks.group]]` table with the `uri` key.
 
 ##### Example:
 
 ```toml
-[project]
+[_]
+schema-version = "0.3"
 id = "sample-java-maven-app"
 name = "Sample Java App"
 version = "1.0.0"
 
-[[build.buildpacks]]
+[[io.buildpacks.group]]
 uri = "samples/java-maven"
 
-[[build.buildpacks]]
+[[io.buildpacks.group]]
 uri = "samples/buildpacks/hello-processes/"
 
-[[build.buildpacks]]
-uri = "docker://cnbs/sample-package:hello-univers"
+[[io.buildpacks.group]]
+uri = "docker://cnbs/sample-package:hello-universe"
 ```
 
 ## URI Examples

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

@@ -6,22 +6,23 @@ summary="Learn how to create an ephemeral buildpack to customize your build."
 
 You can supplement your app's build process with custom scripts by creating an _inline buildpack_. An inline buildpack is an ephemeral buildpack that's defined in your [project descriptor][project-toml] (i.e. `project.toml`). You can include a script to run as part of the build without setting up all the files and directories that are required for a complete buildpack.
 
-Inline buildpacks are defined as an entry in the `[[build.buildpacks]]` table of the project descriptor by including an `inline` script in the `[build.buildpacks.script]` table.
+Inline buildpacks are defined as an entry in the `[[io.buildpacks.group]]` table of the project descriptor by including an `inline` script in the `[io.buildpacks.group.script]` table.
 
 For example, you may want to run a Rake task against a Ruby app after the Ruby buildpack builds your app.
 
 ```toml
-[project]
+[_]
+schema-version = "0.2"
 id = "io.buildpacks.my-app"
 
-[[build.buildpacks]]
+[[io.buildpacks.group]]
 id = "example/ruby"
 version = "1.0"
 
-[[build.buildpacks]]
+[[io.buildpacks.group]]
 id = "me/rake-tasks"
 
-  [build.buildpacks.script]
+  [io.buildpacks.group.script]
   api = "0.6"
   inline = "rake package"
 ```
@@ -33,10 +34,10 @@ In this example, the `me/rake-tasks` inline buildpack is configured to run after
 Inline buildpacks aren't constrained to a single command, however. You can define complex scripts as [heredocs](https://toml.io/en/v1.0.0#string) in your project descriptor. For example, this snippet of a descriptor will source a shell script contained in the app repo, use it to modify the app directory (and thus the files that go into the final image), and create slices for the app:
 
 ```toml
-[[build.buildpacks]]
+[[io.buildpacks.group]]
 id = "me/cleanup"
 
-  [build.buildpacks.script]
+  [io.buildpacks.group.script]
   api = "0.9"
   inline = """
 set -e

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

@@ -19,20 +19,20 @@ Note the `include` and `exclude` sections in the below `project.toml` file use `
 file at the root of the application. For more on `gitignore` matching see [these docs](https://linuxize.com/post/gitignore-ignoring-files-in-git/#literal-file-names).
 
 ```toml
-[project]
+[_]
 id = "io.buildpacks.bash-script"
 name = "Bash Script"
 version = "1.0.0"
 
-[build]
+[io.buildpacks]
 exclude = [
     "/README.md",
     "bash-script-buildpack"
 ]
 
 include = []
 
-[[build.buildpacks]]
+[[io.buildpacks.group]]
 uri = "bash-script-buildpack/"
 ```
 
@@ -67,24 +67,24 @@ understand the environment), we would want to add it to our `project.toml`.
 Below is an expanded `project.toml`, with an additional buildpack and environment variable included.
 
 ```toml
-[project]
+[_]
 id = "io.buildpacks.bash-script"
 name = "Bash Script"
 version = "1.0.0"
 
-[build]
+[io.buildpacks]
 exclude = [
     "README.md",
     "bash-script-buildpack"
 ]
-[[build.buildpacks]]
+[[io.buildpacks.group]]
 uri = "../../buildpacks/hello-world/"
 
 
-[[build.buildpacks]]
+[[io.buildpacks.group]]
 uri = "bash-script-buildpack/"
 
-[[build.env]]
+[[io.buildpacks.build.env]]
 name='HELLO'
 value='WORLD'
 ```

content/docs/buildpack-author-guide/publishing-with-github-actions.md

@@ -41,8 +41,10 @@ jobs:
         registry: docker.io
         username: ${{ secrets.DOCKER_HUB_USER }}
         password: ${{ secrets.DOCKER_HUB_PASS }}
+    - id: setup-tools
+      uses: buildpacks/github-actions/[email protected]
     - id: setup-pack
-      uses: buildpacks/github-actions/setup-pack@v4.9.0
+      uses: buildpacks/github-actions/setup-pack@v5.1.0
     - id: package
       run: |
         #!/usr/bin/env bash
@@ -59,7 +61,7 @@ jobs:
       env:
         REPO: docker.io/${{ secrets.DOCKER_HUB_USER }}
     - id: register
-      uses: docker://ghcr.io/buildpacks/actions/registry/request-add-entry:4.9.0
+      uses: docker://ghcr.io/buildpacks/actions/registry/request-add-entry:5.1.0
       with:
         token:   ${{ secrets.PUBLIC_REPO_TOKEN }}
         id:      ${{ steps.package.outputs.bp_id }}

content/docs/extension-author-guide/_index.md

@@ -0,0 +1,10 @@
++++
+title="Extension Guide"
+weight=4
+include_summaries=true
+expand=true
+aliases=[
+    "/docs/create-extension/",
+    "/docs/create-author-extension/"
+]
++++

content/docs/extension-guide/_index.md

@@ -0,0 +1,32 @@
++++
+title="Consume an extension"
+weight=4
+summary="A few notes to help you consume extensions"
+aliases = [
+  "/docs/extension-author-guide/create-extension"
+  ]
++++
+
+<!--+if false+-->
+## Prerequisites
+
+Before we get started, make sure you've got the following installed:
+
+{{< download-button href="https://store.docker.com/search?type=edition&offering=community" color="blue" >}} Install Docker {{</>}}
+{{< download-button href="/docs/install-pack" color="pink" >}} Install pack {{</>}}
+
+You may also need to [create an extension](/docs/extension-guide/create-extension) so that you can consume it.
+
+## Overview
+<!--+end+-->
+
+This is a few notes for using CNB image extensions.
+
+- [consume in your builder](/docs/extension-guide/consume-extension/in-builder)
+- [consume via pack build](/docs/extension-guide/consume-extension/from-cli)
+
+<!--+if false+-->
+---
+
+<a href="/docs/extension-guide/consume-extension/in-builder" class="button bg-pink">Start Tutorial</a>
+<!--+end+-->

content/docs/extension-guide/consume-extension/_index.md

@@ -0,0 +1,14 @@
++++
+title="Specifying an Image Extension at Build Time"
+weight=405
++++
+
+<!-- test:suite=dockerfiles;weight=5 -->
+
+### Specifying an Image Extension at Build Time
+
+No builder can be truly omniscient, and whoever did yours surely was no exception! You need to add a little extra spice to the mix with this late-breaking extension, by doing something like:
+
+`pack build [...] --extension=foo [...]`
+
+

content/docs/extension-guide/consume-extension/from-cli.md

@@ -0,0 +1,25 @@
++++
+title="Specifying an Image Extension in the Builder"
+weight=405
++++
+
+<!-- test:suite=dockerfiles;weight=5 -->
+
+### Specifying an Image Extension in the Builder
+
+You're pretty sharp, and you know what your buildpack users will need.
+That's why you're going to add something similar to the following lines directly to `builder.toml`:
+
+```
+[[order-extensions]]
+[[order-extensions.group]]
+id = "foo"
+version = "0.0.1"
+
+[[extensions]]
+id = "foo"
+version = "0.0.1"
+uri = "/local/path/to/extension/foo" # can be relative or absolute
+```
+
+