Skip to content

Commit 3e67360

Browse files
authored
Merge pull request cds-hooks#496 from buildpacks/fix-ci
Update pack version and output of inspect image
2 parents 666a111 + 8f7f9bd commit 3e67360

File tree

7 files changed

+1266
-298
lines changed

7 files changed

+1266
-298
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ check-pack-cli-version:
9898
.PHONY: install-ugo
9999
install-ugo:
100100
@echo "> Installing ugo..."
101-
cd tools; go install github.com/jromero/ugo/cmd/[email protected].3
101+
cd tools; go install github.com/jromero/ugo/cmd/[email protected].4
102102

103103
.PHONY: pack-docs-update
104104
pack-docs-update: upgrade-pack
@@ -165,7 +165,7 @@ tools-tidy:
165165
cd tools; go mod tidy
166166

167167
.PHONY: prepare-for-pr
168-
prepare-for-pr: check-links test tools-tidy
168+
prepare-for-pr: check-links test tools-tidy katacoda
169169
@echo "========"
170170
@echo "It looks good! :)"
171171
@echo "Make sure to commit all changes!"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ Buildpacks:
3131
examples/ruby 0.0.1 -
3232
3333
Processes:
34-
TYPE SHELL COMMAND ARGS
35-
web (default) bash bundle exec ruby app.rb
36-
worker bash bundle exec ruby worker.rb
34+
TYPE SHELL COMMAND ARGS WORK DIR
35+
web (default) bash bundle exec ruby app.rb /workspace
36+
worker bash bundle exec ruby worker.rb /workspace
3737
```
3838

3939
Apart from the above standard metadata, buildpacks can also populate information about the dependencies they have provided in form of a `Bill-of-Materials`. Let's see how we can use this to populate information about the version of `ruby` that was installed in the output app image.

katacoda/files.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ content/docs/app-developer-guide/using-cache-image.md,katacoda/scenarios/app-dev
44
content/docs/app-developer-guide/environment-variables.md,katacoda/scenarios/app-developer-guide/environment-variables.md
55
content/docs/app-developer-guide/mounting-volumes.md,katacoda/scenarios/app-developer-guide/mounting-volumes.md
66
content/docs/app-developer-guide/run-an-app.md,katacoda/scenarios/app-developer-guide/run-an-app.md
7-
content/docs/app-developer-guide/specify-buildpacks.md,katacoda/scenarios/app-developer-guide/specify-buildpacks.md#
7+
content/docs/app-developer-guide/specify-buildpacks.md,katacoda/scenarios/app-developer-guide/specify-buildpacks.md
88
content/docs/buildpack-author-guide/create-buildpack/_index.md,katacoda/scenarios/buildpack-author-guide/intro.md
99
content/docs/buildpack-author-guide/create-buildpack/adding-bill-of-materials.md,katacoda/scenarios/buildpack-author-guide/adding-bill-of-materials.md
1010
content/docs/buildpack-author-guide/create-buildpack/build-app.md,katacoda/scenarios/buildpack-author-guide/build-app.md

katacoda/scenarios/app-developer-guide/specify-buildpacks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
1+
# Specify buildpacks
22
# Specify buildpacks
33

44

katacoda/scenarios/buildpack-author-guide/adding-bill-of-materials.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ Buildpacks:
2727
examples/ruby 0.0.1 -
2828

2929
Processes:
30-
TYPE SHELL COMMAND ARGS
31-
web (default) bash bundle exec ruby app.rb
32-
worker bash bundle exec ruby worker.rb
30+
TYPE SHELL COMMAND ARGS WORK DIR
31+
web (default) bash bundle exec ruby app.rb /workspace
32+
worker bash bundle exec ruby worker.rb /workspace
3333
```
3434

3535
Apart from the above standard metadata, buildpacks can also populate information about the dependencies they have provided in form of a `Bill-of-Materials`. Let's see how we can use this to populate information about the version of `ruby` that was installed in the output app image.

tools/go.mod

Lines changed: 40 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,44 @@ module github.com/buildpacks/docs/tools
33
go 1.14
44

55
require (
6-
github.com/buildpacks/pack v0.24.1
7-
github.com/gohugoio/hugo v0.82.0
8-
github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect
9-
github.com/sabhiram/go-gitignore v0.0.0-20201211210132-54b8a0bf510f // indirect
10-
github.com/spf13/cobra v1.3.0
6+
cloud.google.com/go v0.102.0 // indirect
7+
github.com/Azure/azure-storage-blob-go v0.15.0 // indirect
8+
github.com/aws/aws-sdk-go v1.44.32 // indirect
9+
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.15 // indirect
10+
github.com/aws/aws-sdk-go-v2/service/ecr v1.17.6 // indirect
11+
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.13.6 // indirect
12+
github.com/bep/debounce v1.2.1 // indirect
13+
github.com/bep/gitmap v1.3.0 // indirect
14+
github.com/buildpacks/lifecycle v0.14.1 // indirect
15+
github.com/buildpacks/pack v0.26.0
16+
github.com/clbanning/mxj/v2 v2.5.6 // indirect
17+
github.com/containerd/cgroups v1.0.4 // indirect
18+
github.com/containerd/containerd v1.6.6 // indirect
19+
github.com/docker/cli v20.10.17+incompatible // indirect
20+
github.com/docker/docker v20.10.17+incompatible // indirect
21+
github.com/evanw/esbuild v0.14.43 // indirect
22+
github.com/getkin/kin-openapi v0.96.0 // indirect
23+
github.com/go-openapi/swag v0.21.1 // indirect
24+
github.com/gohugoio/hugo v0.100.2
25+
github.com/invopop/yaml v0.2.0 // indirect
26+
github.com/klauspost/compress v1.15.6 // indirect
27+
github.com/mailru/easyjson v0.7.7 // indirect
28+
github.com/mattn/go-ieproxy v0.0.7 // indirect
29+
github.com/moby/sys/mount v0.3.3 // indirect
30+
github.com/niklasfasching/go-org v1.6.5 // indirect
31+
github.com/opencontainers/runc v1.1.3 // indirect
32+
github.com/pelletier/go-toml/v2 v2.0.2 // indirect
33+
github.com/rivo/tview v0.0.0-20220610163003-691f46d6f500 // indirect
34+
github.com/spf13/cobra v1.4.0
35+
github.com/tdewolff/minify/v2 v2.11.9 // indirect
36+
github.com/tdewolff/parse/v2 v2.6.0 // indirect
37+
gocloud.dev v0.25.0 // indirect
38+
golang.org/x/image v0.0.0-20220601225756-64ec528b34cd // indirect
39+
golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb // indirect
40+
golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d // indirect
41+
golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 // indirect
42+
golang.org/x/tools v0.1.11 // indirect
43+
golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
44+
google.golang.org/api v0.83.0 // indirect
45+
google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac // indirect
1146
)

0 commit comments

Comments
 (0)