Merge branch 'main' into feat/test-lifecycle-orchastration

Signed-off-by: Aidan Delaney <[email protected]>
buildpacks · Dec 13, 2024 · a7d7337 · a7d7337
2 parents d25a880 + 4d81080
commit a7d7337
Show file tree

Hide file tree

Showing 8 changed files with 306 additions and 337 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Install pack
         uses: buildpacks/github-actions/[email protected]
         with:
-          pack-version: '0.31.0'
+          pack-version: '0.36.0'
       - name: Test
         run: make test
         env:

diff --git a/.../docs/for-buildpack-authors/tutorials/basic-buildpack/02_building-blocks-cnb.md b/.../docs/for-buildpack-authors/tutorials/basic-buildpack/02_building-blocks-cnb.md
@@ -25,7 +25,7 @@ pack buildpack new examples/node-js \
     --api 0.10 \
     --path node-js-buildpack \
     --version 0.0.1 \
-    --stacks io.buildpacks.samples.stacks.noble
+    --targets "linux/amd64"
 ```
 <!--+- "{{execute}}"+-->
 This command will create `node-js-buildpack` directory which contains `buildpack.toml`, `bin/build`,  `bin/detect` files.
@@ -34,7 +34,6 @@ This command will create `node-js-buildpack` directory which contains `buildpack
 - `-a, --api` Buildpack API compatibility of the generated buildpack
 - `-h, --help` Help for 'new'
 - `--path` the location on the filesystem to generate the artifacts
-- `--stacks` Stacks (deprecated) the buildpack will work with
 - `-V, --version` the version of the buildpack in buildpack.toml
 
 
@@ -55,11 +54,7 @@ api = "0.10"
 # Targets the buildpack will work with
 [[targets]]
 os = "linux"
-
-# Stacks (deprecated) the buildpack will work with
-[[stacks]]
-  id = "io.buildpacks.samples.stacks.noble"
-
+architecture = "amd64"
 ```
 
 The buildpack ID is the way you will reference the buildpack when you create buildpack groups, builders, etc.
@@ -130,9 +125,9 @@ After running the command, you should see that it failed to detect, as the `dete
 ```
 ===> DETECTING
 ...
-err:  examples/[email protected] (1)
-ERROR: No buildpack groups passed detection.
-ERROR: failed to detect: buildpack(s) failed with err
+[detector] err:  examples/[email protected] (1)
+[detector] ERROR: No buildpack groups passed detection.
+[detector] ERROR: failed to detect: buildpack(s) failed with err
 ERROR: failed to build: executing lifecycle: failed with status code: 21
 ```
 

diff --git a/content/docs/for-buildpack-authors/tutorials/basic-buildpack/04_build-app.md b/content/docs/for-buildpack-authors/tutorials/basic-buildpack/04_build-app.md
@@ -94,8 +94,8 @@ You will see the following output:
 ...
 ===> RESTORING
 ===> BUILDING
----> NodeJS Buildpack
----> Downloading and extracting NodeJS
+[builder] ---> NodeJS Buildpack
+[builder] ---> Downloading and extracting NodeJS
 ...
 ===> EXPORTING
 ...

diff --git a/content/docs/for-buildpack-authors/tutorials/basic-buildpack/06_caching.md b/content/docs/for-buildpack-authors/tutorials/basic-buildpack/06_caching.md
@@ -140,8 +140,8 @@ you will see the new caching logic at work during the `BUILDING` phase:
 ```text
 ===> BUILDING
 ...
----> NodeJS Buildpack
------> Reusing NodeJS
+[builder] ---> NodeJS Buildpack
+[builder] -----> Reusing NodeJS
 ```
 
 Next, let's see how buildpack users may be able to provide configuration to the buildpack.

diff --git a/...r-buildpack-authors/tutorials/basic-buildpack/07_make-buildpack-configurable.md b/...r-buildpack-authors/tutorials/basic-buildpack/07_make-buildpack-configurable.md
@@ -112,8 +112,8 @@ You will notice that version of NodeJS specified in the app's `.node-js-version`
 ```text
 ===> BUILDING
 ...
----> NodeJS Buildpack
------> Downloading and extracting NodeJS 18.18.1
+[builder] ---> NodeJS Buildpack
+[builder] -----> Downloading and extracting NodeJS 18.18.1
 ```
 
 ## Going further

diff --git a/content/docs/for-buildpack-authors/tutorials/basic-extension/02_why-dockerfiles.md b/content/docs/for-buildpack-authors/tutorials/basic-extension/02_why-dockerfiles.md
@@ -56,6 +56,7 @@ Create the builder:
 ```bash
 pack builder create localhost:5000/extensions-builder \
   --config $PWD/samples/builders/alpine/builder.toml \
+  --target "linux/amd64" \
   --publish
 ```
 

diff --git a/tools/go.mod b/tools/go.mod
diff --git a/tools/go.sum b/tools/go.sum
-Original file line number
+Diff line change
@@ Expand Up / @@ -56,6 +56,7 @@ Create the builder: @@
     ```bash
     pack builder create localhost:5000/extensions-builder \
       --config $PWD/samples/builders/alpine/builder.toml \
+      --target "linux/amd64" \
       --publish
     ```
@@ Expand Down @@