Skip to content

Commit d7935f2

Browse files
committed
Make all samples multi-arch
Restrict samples that download amd64 binaries to amd64 Signed-off-by: Aidan Delaney <[email protected]>
1 parent 1729047 commit d7935f2

File tree

8 files changed

+33
-48
lines changed

8 files changed

+33
-48
lines changed

builders/alpine/builder.toml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# Buildpacks to include in builder
22
[[buildpacks]]
33
id = "samples/java-maven"
4-
version = "0.0.2"
4+
version = "0.0.3"
55
uri = "../../buildpacks/java-maven"
66

77
[[buildpacks]]
88
id = "samples/kotlin-gradle"
9-
version = "0.0.2"
9+
version = "0.0.3"
1010
uri = "../../buildpacks/kotlin-gradle"
1111

1212
[[buildpacks]]
@@ -42,17 +42,17 @@ version = "0.0.1"
4242
[[order]]
4343
[[order.group]]
4444
id = "samples/java-maven"
45-
version = "0.0.2"
45+
version = "0.0.3"
4646

4747
[[order]]
4848
[[order.group]]
4949
id = "samples/kotlin-gradle"
50-
version = "0.0.2"
50+
version = "0.0.3"
5151

5252
[[order]]
5353
[[order.group]]
5454
id = "samples/hello-universe"
55-
version = "0.0.1"
55+
version = "0.0.2"
5656

5757
# Order used for detection (extensions)
5858
[[order-extensions]]
@@ -75,8 +75,10 @@ image = "cnbs/sample-base-build:alpine"
7575
[[run.images]]
7676
image = "cnbs/sample-base-run:alpine"
7777

78-
# Stack (deprecated) used to create the builder
79-
[stack]
80-
id = "io.buildpacks.samples.stacks.alpine"
81-
build-image = "cnbs/sample-base-build:alpine"
82-
run-image = "cnbs/sample-base-run:alpine"
78+
[[targets]]
79+
arch = "amd64"
80+
os = "linux"
81+
82+
[[targets]]
83+
arch = "arm64"
84+
os = "linux"

builders/noble/builder.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
# Buildpacks to include in builder
22
[[buildpacks]]
33
id = "samples/java-maven"
4-
version = "0.0.2"
4+
version = "0.0.3"
55
uri = "../../buildpacks/java-maven"
66

77
[[buildpacks]]
88
id = "samples/kotlin-gradle"
9-
version = "0.0.2"
9+
version = "0.0.3"
1010
uri = "../../buildpacks/kotlin-gradle"
1111

1212
[[buildpacks]]
1313
id = "samples/ruby-bundler"
14-
version = "0.0.1"
14+
version = "0.0.2"
1515
uri = "../../buildpacks/ruby-bundler"
1616

1717
[[buildpacks]]
@@ -31,12 +31,12 @@ version = "0.0.2"
3131
[[order]]
3232
[[order.group]]
3333
id = "samples/ruby-bundler"
34-
version = "0.0.1"
34+
version = "0.0.2"
3535

3636
[[order]]
3737
[[order.group]]
3838
id = "samples/hello-universe"
39-
version = "0.0.1"
39+
version = "0.0.2"
4040

4141
# Base images used to create the builder
4242
[build]

buildpacks/hello-moon/buildpack.toml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
11
# Buildpack API version
2-
api = "0.10"
2+
api = "0.14"
33

44
# Buildpack ID and metadata
55
[buildpack]
66
id = "samples/hello-moon"
7-
version = "0.0.1"
7+
version = "0.0.2"
88
name = "Hello Moon Buildpack"
99
homepage = "https://github.com/buildpacks/samples/tree/main/buildpacks/hello-moon"
1010
sbom-formats = ["application/vnd.cyclonedx+json"]
1111

1212
# Targets the buildpack will work with
1313
[[targets]]
1414
os = "linux"
15-
16-
# Stacks (deprecated) the buildpack will work with
17-
[[stacks]]
18-
id = "*"

buildpacks/hello-universe/buildpack.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ api = "0.10"
44
# Buildpack ID and metadata
55
[buildpack]
66
id = "samples/hello-universe"
7-
version = "0.0.1"
7+
version = "0.0.2"
88
name = "Hello Universe Buildpack"
99
homepage = "https://github.com/buildpacks/samples/tree/main/buildpacks/hello-universe"
1010

1111
# Order used for detection
1212
[[order]]
1313
[[order.group]]
1414
id = "samples/hello-world"
15-
version = "0.0.1"
15+
version = "0.0.2"
1616

1717
[[order.group]]
1818
id = "samples/hello-moon"
19-
version = "0.0.1"
19+
version = "0.0.2"

buildpacks/hello-world/buildpack.toml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
11
# Buildpack API version
2-
api = "0.10"
2+
api = "0.14"
33

44
# Buildpack ID and metadata
55
[buildpack]
66
id = "samples/hello-world"
7-
version = "0.0.1"
7+
version = "0.0.2"
88
name = "Hello World Buildpack"
99
homepage = "https://github.com/buildpacks/samples/tree/main/buildpacks/hello-world"
1010

1111
# Targets the buildpack will work with
1212
[[targets]]
1313
os = "linux"
14-
15-
# Stacks (deprecated) the buildpack will work with
16-
[[stacks]]
17-
id = "*"

buildpacks/java-maven/buildpack.toml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
# Buildpack API version
2-
api = "0.10"
2+
api = "0.14"
33

44
# Buildpack ID and metadata
55
[buildpack]
66
id = "samples/java-maven"
7-
version = "0.0.2"
7+
version = "0.0.3"
88
name = "Sample Java Maven Buildpack"
99
homepage = "https://github.com/buildpacks/samples/tree/main/buildpacks/java-maven"
1010

1111
# Targets the buildpack will work with
1212
[[targets]]
13+
arch = "amd64"
1314
os = "linux"
14-
15-
# Stacks (deprecated) the buildpack will work with
16-
[[stacks]]
17-
id = "*"
Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
# Buildpack API version
2-
api = "0.10"
2+
api = "0.14"
33

44
# Buildpack ID and metadata
55
[buildpack]
66
id = "samples/kotlin-gradle"
7-
version = "0.0.2"
7+
version = "0.0.3"
88
name = "Sample Kotlin Gradle Buildpack"
99
homepage = "https://github.com/buildpacks/samples/tree/main/buildpacks/kotlin-gradle"
1010

1111
# Targets the buildpack will work with
1212
[[targets]]
13+
arch = "amd64"
1314
os = "linux"
14-
15-
# Stacks (deprecated) the buildpack will work with
16-
[[stacks]]
17-
id = "*"
Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
# Buildpack API version
2-
api = "0.10"
2+
api = "0.14"
33

44
# Buildpack ID and metadata
55
[buildpack]
66
id = "samples/ruby-bundler"
7-
version = "0.0.1"
7+
version = "0.0.2"
88
name = "Sample Ruby Buildpack"
99
homepage = "https://github.com/buildpacks/samples/tree/main/buildpacks/ruby-bundler"
1010

1111
# Targets the buildpack will work with
1212
[[targets]]
13+
arch = "amd64"
1314
os = "linux"
14-
15-
# Stacks (deprecated) the buildpack will work with
16-
[[stacks]]
17-
id = "*"

0 commit comments

Comments
 (0)