Skip to content

Commit e74d00f

Browse files
author
Natalie Arellano
committed
Merge branch 'main' into runext/demo
2 parents ed41a6c + 2e89efc commit e74d00f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+193
-120
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ endif
4343
endif
4444

4545
ifeq ($(shell uname -s),Darwin)
46-
HUGO_OS:=macOS
46+
HUGO_OS:=darwin
4747
HUGO_ARCH:=universal
4848
endif
4949

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

144144
.PHONY: htmltest-install
145145
htmltest-install:
@@ -188,4 +188,4 @@ katacoda:
188188
check-katacoda: katacoda
189189
@echo "Checking if Katacoda docs are up-to-date..."
190190
@git diff --quiet HEAD -- katacoda/scenarios || ( echo "Katacoda docs are not up-to-date! Please run 'make katacoda' and commit the katacoda/scenarios folder" && exit 1)
191-
@echo "All katacoda docs are up-to-date"
191+
@echo "All katacoda docs are up-to-date"

RELEASE.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ Some use cases in which this may be desired...
1515
### Process
1616

1717
1. A milestone in the following format is created: `<component(s)>/<version>` <sup>*</sup>
18-
1. Issues are created and tagged with appropriete milestone.
18+
1. Issues are created and tagged with appropriate milestone.
1919
1. A release branch in the following format is created off of `main`: `release/<component(s)>/<version>` <sup>*</sup>
2020
1. As changes are completed, PRs would target the release branch and merged using the same guidelines as merging to `main`.
21-
1. Once all issues and/or the associated component release is shipped, the release branch is merged into `main` by subteam maintainers.
21+
1. Once all issues and/or the associated component release is shipped, the release branch is merged into `main` by sub-team maintainers.
2222

2323
_* may require a [project contributor or maintainer](https://github.com/buildpacks/community/blob/main/TEAMS.md) intervention._
2424

2525

26-
##### Example Namings
26+
##### Example Naming
2727

2828
Branches:
2929

@@ -42,7 +42,7 @@ Milestones:
4242

4343
##### Example Workflow
4444

45-
Let's imagine `pack` is releasing version `1.2.3`. It is known that there will be a decent amount of changes to a few guides and we'd like to seperate the entire set of changes per guide. The steps that would be taken are as follows:
45+
Let's imagine `pack` is releasing version `1.2.3`. It is known that there will be a decent amount of changes to a few guides and we'd like to separate the entire set of changes per guide. The steps that would be taken are as follows:
4646

4747
1. A milestone `pack/1.2.3` would be created.
4848
1. Issues for the necessary changes would be tagged with milestone `pack/1.2.3`.

content/community.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Partake in one or many of our following public events:
1515

1616
#### How can I start contributing?
1717

18-
If you are new to the project, the first thing you should do is gain some understanding of the project. This normaly entails doing the following:
18+
If you are new to the project, the first thing you should do is gain some understanding of the project. This normally entails doing the following:
1919

2020
1. Watch a few [talks (videos)][talks].
2121
2. Next, run through some [tutorials][tutorials].
@@ -30,7 +30,7 @@ If you didn't find anything you'd like to improve while going through the tutori
3030
| [`lifecycle`][lifecycle] | Go, Docker | Executables that implement the main [specifications][spec] and are used by [platforms][platforms] such as `pack`.
3131
| [`docs`][docs] | Hugo, HTML, JavaScript | Main website and documentation.
3232

33-
> Dependending our your depth of understading or desires some components may be more ideal than others.
33+
> Depending our your depth of understanding or desires some components may be more ideal than others.
3434
3535
[talks]: /docs/#talks
3636
[tutorials]: /docs/#tutorials

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ pack builder suggest
3131
```
3232
<!--+- "{{execute}}"+-->
3333

34-
For this guide we're actually going to use a sample builder, `cnbs/sample-builder:bionic`, which is not listed
34+
For this guide we're actually going to use a sample builder, `cnbs/sample-builder:jammy`, which is not listed
3535
as a suggested builder for good reason. It's a sample.
3636

3737
### 2. Build your app
@@ -47,12 +47,12 @@ ls samples || git clone https://github.com/buildpacks/samples
4747

4848
2. Build the app
4949
```
50-
pack build sample-app --path samples/apps/java-maven --builder cnbs/sample-builder:bionic
50+
pack build sample-app --path samples/apps/java-maven --builder cnbs/sample-builder:jammy
5151
```
5252
<!--+- "{{execute}}"+-->
5353

5454
> **TIP:** If you don't want to keep specifying a builder every time you build, you can set it as your default
55-
> builder by running `pack config default-builder <BUILDER>` for example `pack config default-builder cnbs/sample-builder:bionic`
55+
> builder by running `pack config default-builder <BUILDER>` for example `pack config default-builder cnbs/sample-builder:jammy`
5656
<!--+- "{{execute}}"+-->
5757
5858
### 3. Run it

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ docker run --rm \
7474
--volume ~/workspace/platform:/platform \
7575
--mount type=bind,source=~/workspace/order.toml,target=/cnb/order.toml \
7676
--env CNB_PLATFORM_API=0.7 \
77-
ubuntu:bionic \
78-
/cnb/lifecycle/creator -log-level debug -daemon -run-image ubuntu:bionic hello-arm64
77+
ubuntu:jammy \
78+
/cnb/lifecycle/creator -log-level debug -daemon -run-image ubuntu:jammy hello-arm64
7979
```
8080

8181
### 4. Run it

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ git clone https://github.com/buildpacks/samples
4747
![](https://i.imgur.com/0mmV6K7.png)
4848

4949
```shell=bash
50-
pack build sample-app -p samples/apps/ruby-bundler/ -B cnbs/sample-builder:bionic
50+
pack build sample-app -p samples/apps/ruby-bundler/ -B cnbs/sample-builder:jammy
5151
```
5252

5353
Where:

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export FOO=BAR
3030
pack build sample-app \
3131
--env "HELLO=WORLD" \
3232
--env "FOO" \
33-
--builder cnbs/sample-builder:bionic \
33+
--builder cnbs/sample-builder:jammy \
3434
--buildpack samples/buildpacks/hello-world/ \
3535
--buildpack samples/apps/bash-script/bash-script-buildpack/ \
3636
--path samples/apps/bash-script/
@@ -76,7 +76,7 @@ echo -en "HELLO=WORLD\nFOO" > ./envfile
7676
```
7777
pack build sample-app \
7878
--env-file ./envfile \
79-
--builder cnbs/sample-builder:bionic \
79+
--builder cnbs/sample-builder:jammy \
8080
--buildpack samples/buildpacks/hello-world/ \
8181
--buildpack samples/apps/bash-script/bash-script-buildpack/ \
8282
--path samples/apps/bash-script/
@@ -122,7 +122,7 @@ EOL
122122
2. Build the app
123123
```
124124
pack build sample-app \
125-
--builder cnbs/sample-builder:bionic \
125+
--builder cnbs/sample-builder:jammy \
126126
--buildpack samples/buildpacks/hello-world/ \
127127
--buildpack samples/apps/bash-script/bash-script-buildpack/ \
128128
--path samples/apps/bash-script/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Now, we can mount this volume during `pack build`:
8787
```bash
8888
ls -al
8989
pack build volume-example \
90-
--builder cnbs/sample-builder:bionic \
90+
--builder cnbs/sample-builder:jammy \
9191
--buildpack samples/buildpacks/hello-world \
9292
--path samples/apps/bash-script \
9393
--volume test-volume:/platform/volume:ro

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ A buildpack located in a CNB Registry
102102
- `urn:cnb:registry:[email protected]`
103103

104104
<small><sup>†</sup> Directory buildpacks are not currently supported on Windows.</small><br />
105-
<small><sup>‡</sup> Version may be omited if there is only one buildpack in the builder matching the `id`.</small>
105+
<small><sup>‡</sup> Version may be omitted if there is only one buildpack in the builder matching the `id`.</small>
106106

107107
[project-toml]: /docs/app-developer-guide/using-project-descriptor/
108108
[samples]: https://github.com/buildpacks/samples

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ For the following examples we will use:
2929
> **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`
3030
3131

32-
Next we trust the `cnbs/sample-builder:bionic` builder in order to allow access to docker credentials when publishing.
32+
Next we trust the `cnbs/sample-builder:jammy` builder in order to allow access to docker credentials when publishing.
3333

3434
```
35-
pack config trusted-builders add cnbs/sample-builder:bionic
35+
pack config trusted-builders add cnbs/sample-builder:jammy
3636
```
3737
<!--+- "{{execute}}"+-->
3838

@@ -42,7 +42,7 @@ To build the `localhost:5000/buildpack-examples/cache-image-example` application
4242

4343
```
4444
pack build localhost:5000/buildpack-examples/cache-image-example \
45-
--builder cnbs/sample-builder:bionic \
45+
--builder cnbs/sample-builder:jammy \
4646
--buildpack samples/java-maven \
4747
--path samples/apps/java-maven \
4848
--cache-image localhost:5000/buildpack-examples/maven-cache-image:latest \
@@ -76,7 +76,7 @@ builds may also update the specified `cache-image`.
7676
The following command will restore data for the `samples/java-maven:maven_m2` layer from the cache image.
7777
```
7878
pack build localhost:5000/buildpack-examples/second-cache-image-example \
79-
--builder cnbs/sample-builder:bionic \
79+
--builder cnbs/sample-builder:jammy \
8080
--buildpack samples/java-maven \
8181
--path samples/apps/java-maven \
8282
--cache-image localhost:5000/buildpack-examples/maven-cache-image:latest \

0 commit comments

Comments
 (0)