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

Author: jjbustamante

Makefile

@@ -139,7 +139,7 @@ build: $(HUGO_BIN) pack-version pack-docs-update
 .PHONY: test
 test: install-pack-cli check-pack-cli-version install-ugo
 	@echo "> Testing..."
-	ugo run -r -p ./content/docs/
+	ugo run -v -r -p ./content/docs/
 
 .PHONY: htmltest-install
 htmltest-install:

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

@@ -31,7 +31,7 @@ pack builder suggest
 ```
 <!--+- "{{execute}}"+-->
 
-For this guide we're actually going to use a sample builder, `cnbs/sample-builder:bionic`, which is not listed
+For this guide we're actually going to use a sample builder, `cnbs/sample-builder:jammy`, which is not listed
 as a suggested builder for good reason. It's a sample.
 
 ### 2. Build your app
@@ -47,12 +47,12 @@ ls samples || git clone https://github.com/buildpacks/samples
 
 2. Build the app
 ```
-pack build sample-app --path samples/apps/java-maven --builder cnbs/sample-builder:bionic
+pack build sample-app --path samples/apps/java-maven --builder cnbs/sample-builder:jammy
 ```
 <!--+- "{{execute}}"+-->
 
 > **TIP:** If you don't want to keep specifying a builder every time you build, you can set it as your default
-> builder by running `pack config default-builder <BUILDER>` for example `pack config default-builder cnbs/sample-builder:bionic`
+> builder by running `pack config default-builder <BUILDER>` for example `pack config default-builder cnbs/sample-builder:jammy`
 <!--+- "{{execute}}"+-->
 
 ### 3. Run it

content/docs/app-developer-guide/build-an-arm-app.md

@@ -74,8 +74,8 @@ docker run --rm \
   --volume ~/workspace/platform:/platform \
   --mount type=bind,source=~/workspace/order.toml,target=/cnb/order.toml \
   --env CNB_PLATFORM_API=0.7 \
-  ubuntu:bionic \
-  /cnb/lifecycle/creator -log-level debug -daemon -run-image ubuntu:bionic hello-arm64
+  ubuntu:jammy \
+  /cnb/lifecycle/creator -log-level debug -daemon -run-image ubuntu:jammy hello-arm64
 ```
 
 ### 4. Run it

content/docs/app-developer-guide/building-on-podman.md

@@ -47,7 +47,7 @@ git clone https://github.com/buildpacks/samples
 ![](https://i.imgur.com/0mmV6K7.png)
 
 ```shell=bash
-pack build sample-app -p samples/apps/ruby-bundler/ -B cnbs/sample-builder:bionic
+pack build sample-app -p samples/apps/ruby-bundler/ -B cnbs/sample-builder:jammy
 ```
 
 Where:

content/docs/app-developer-guide/environment-variables.md

@@ -30,7 +30,7 @@ export FOO=BAR
 pack build sample-app \
     --env "HELLO=WORLD" \
     --env "FOO" \
-    --builder cnbs/sample-builder:bionic \
+    --builder cnbs/sample-builder:jammy \
     --buildpack  samples/buildpacks/hello-world/ \
     --buildpack samples/apps/bash-script/bash-script-buildpack/ \
     --path  samples/apps/bash-script/
@@ -76,7 +76,7 @@ echo -en "HELLO=WORLD\nFOO" > ./envfile
 ```
 pack build sample-app \
     --env-file ./envfile \
-    --builder cnbs/sample-builder:bionic \
+    --builder cnbs/sample-builder:jammy \
     --buildpack  samples/buildpacks/hello-world/ \
     --buildpack samples/apps/bash-script/bash-script-buildpack/ \
     --path  samples/apps/bash-script/
@@ -122,7 +122,7 @@ EOL
 2. Build the app
 ```
 pack build sample-app \
-    --builder cnbs/sample-builder:bionic \
+    --builder cnbs/sample-builder:jammy \
     --buildpack  samples/buildpacks/hello-world/ \
     --buildpack samples/apps/bash-script/bash-script-buildpack/ \
     --path  samples/apps/bash-script/

content/docs/app-developer-guide/mounting-volumes.md

@@ -87,7 +87,7 @@ Now, we can mount this volume during `pack build`:
 ```bash
 ls -al
 pack build volume-example \
-    --builder cnbs/sample-builder:bionic \
+    --builder cnbs/sample-builder:jammy \
     --buildpack samples/buildpacks/hello-world \
     --path samples/apps/bash-script \
     --volume test-volume:/platform/volume:ro

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-cache-image.md

@@ -29,10 +29,10 @@ For the following examples we will use:
 > **NOTE:**  If we wish to publish to an external registry like `Dockerhub` we will first need to authenticate with `docker` to allow us to push images. We can do this via `docker login`
 
 
-Next we trust the `cnbs/sample-builder:bionic` builder in order to allow access to docker credentials when publishing.
+Next we trust the `cnbs/sample-builder:jammy` builder in order to allow access to docker credentials when publishing.
 
 ```
-pack config trusted-builders add cnbs/sample-builder:bionic
+pack config trusted-builders add cnbs/sample-builder:jammy
 ```
 <!--+- "{{execute}}"+-->
 
@@ -42,7 +42,7 @@ To build the `localhost:5000/buildpack-examples/cache-image-example` application
 
 ```
 pack build localhost:5000/buildpack-examples/cache-image-example \
-    --builder cnbs/sample-builder:bionic \
+    --builder cnbs/sample-builder:jammy \
     --buildpack samples/java-maven \
     --path samples/apps/java-maven \
     --cache-image localhost:5000/buildpack-examples/maven-cache-image:latest \
@@ -76,7 +76,7 @@ builds may also update the specified `cache-image`.
 The following command will restore data for the `samples/java-maven:maven_m2` layer from the cache image.
 ```
 pack build localhost:5000/buildpack-examples/second-cache-image-example \
-    --builder cnbs/sample-builder:bionic \
+    --builder cnbs/sample-builder:jammy \
     --buildpack samples/java-maven \
     --path samples/apps/java-maven \
     --cache-image localhost:5000/buildpack-examples/maven-cache-image:latest \

content/docs/app-developer-guide/using-http-proxy.md

@@ -16,8 +16,8 @@ We show how to solve both of these constraints.
 You may need the `pack` command-line tool to download buildpacks and images via your proxy.  Building an application with an incorrectly configured proxy results in errors such as the following:
 
 ```console
-$ pack build sample-app --path samples/apps/java-maven --builder cnbs/sample-builder:bionic
-ERROR: failed to build: failed to fetch builder image 'index.docker.io/cnbs/sample-builder:bionic'
+$ pack build sample-app --path samples/apps/java-maven --builder cnbs/sample-builder:jammy
+ERROR: failed to build: failed to fetch builder image 'index.docker.io/cnbs/sample-builder:jammy'
 : Error response from daemon: Get "https//registry-1.docker.io/v2/": context deadline exceeded
 ```
 
@@ -37,7 +37,7 @@ Buildpacks may also need to be aware of your http and https proxies at build tim
 ```console
 export http_proxy=http://user:[email protected]:3128
 export https_proxy=https://my-proxy.example.com:3129
-pack build sample-app --path samples/apps/java-maven --builder cnbs/sample-builder:bionic
+pack build sample-app --path samples/apps/java-maven --builder cnbs/sample-builder:jammy
 ```
 
 ## Making your Application Proxy Aware

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.script]
   api = "0.9"
   inline = """
 set -e