-
Notifications
You must be signed in to change notification settings - Fork 104
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
More fixes for target compat checking during detect (#1354)
* More fixes for target compat checking during detect - If a buildpack fails to specify os/arch (but specifies distro) still check targets - If the run image fails to specify os/arch (this should not happen actually as we will fail during analyze) still check targets - Fix typo in buildpack descriptor struct so that we actually get stack information - If we get distro information from /etc/os-release, persist this information to later invocations to that the log message printed when errors are encountered will be accurate - Don't override inner `i` in loop (this should not actually affect the outer loop but is confusing) Signed-off-by: Natalie Arellano <narellano@vmware.com> * When stack is "any", don't infer empty target as it is not needed Missing targets is sufficient for wildcard match Signed-off-by: Natalie Arellano <narellano@vmware.com> * Remove backwards compatible glue that actually causes fewer builds to succeed Fixes #1355 Signed-off-by: Natalie Arellano <narellano@vmware.com> * Remove exit (this was added for debugging purposes) Signed-off-by: Natalie Arellano <narellano@vmware.com> --------- Signed-off-by: Natalie Arellano <narellano@vmware.com>
- Loading branch information
1 parent
1a1de08
commit 73f6927
Showing
12 changed files
with
226 additions
and
72 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
FROM ubuntu:bionic | ||
FROM ubuntu:jammy | ||
|
||
ARG cnb_uid=1234 | ||
ARG cnb_gid=1000 | ||
|
14 changes: 10 additions & 4 deletions
14
...etector/container/cnb/buildpacks/simple_buildpack/simple_buildpack_version/buildpack.toml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,12 @@ | ||
api = "0.10" | ||
api = "0.9" | ||
|
||
[buildpack] | ||
id = "simple_buildpack" | ||
version = "simple_buildpack_version" | ||
name = "Simple Buildpack" | ||
id = "simple_buildpack" | ||
version = "simple_buildpack_version" | ||
name = "Simple Buildpack" | ||
|
||
[[stacks]] | ||
id = "io.buildpacks.stacks.bionic" | ||
|
||
[[stacks]] | ||
id = "io.buildpacks.stacks.jammy" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
api = "0.7" | ||
|
||
[buildpack] | ||
id = "B" | ||
name = "Buildpack B" | ||
version = "v1.2" | ||
homepage = "Buildpack B Homepage" | ||
sbom-formats = ["application/vnd.cyclonedx+json"] | ||
|
||
[[stacks]] | ||
id = "io.buildpacks.stacks.bionic" | ||
|
||
[[stacks]] | ||
id = "io.buildpacks.stacks.jammy" |
11 changes: 11 additions & 0 deletions
11
buildpack/testdata/buildpack/by-id/B/v1.star/buildpack.toml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
api = "0.7" | ||
|
||
[buildpack] | ||
id = "B" | ||
name = "Buildpack B" | ||
version = "v1.star" | ||
homepage = "Buildpack B Homepage" | ||
sbom-formats = ["application/vnd.cyclonedx+json"] | ||
|
||
[[stacks]] | ||
id = "*" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
api = "0.12" | ||
|
||
[buildpack] | ||
id = "B" | ||
name = "Buildpack B" | ||
version = "v2.2" | ||
homepage = "Buildpack B Homepage" | ||
sbom-formats = ["application/vnd.cyclonedx+json"] | ||
|
||
[[stacks]] | ||
id = "io.buildpacks.stacks.bionic" | ||
|
||
[[stacks]] | ||
id = "io.buildpacks.stacks.jammy" |
11 changes: 11 additions & 0 deletions
11
buildpack/testdata/buildpack/by-id/B/v2.star/buildpack.toml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
api = "0.12" | ||
|
||
[buildpack] | ||
id = "B" | ||
name = "Buildpack B" | ||
version = "v2.star" | ||
homepage = "Buildpack B Homepage" | ||
sbom-formats = ["application/vnd.cyclonedx+json"] | ||
|
||
[[stacks]] | ||
id = "*" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.