Skip to content

Commit

Permalink
feat(cnbBuild): Use Paketo Jammy builder as default (#4694)
Browse files Browse the repository at this point in the history
  • Loading branch information
pbusko authored Nov 23, 2023
1 parent 0006f10 commit 0baa6a6
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion cmd/cnbBuild_generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions cmd/cnbBuild_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ func TestRunCnbBuild(t *testing.T) {
assert.Contains(t, runner.Calls[1].Params, "my-process")
assert.Equal(t, config.ContainerRegistryURL, commonPipelineEnvironment.container.registryURL)
assert.Equal(t, "my-image:0.0.1", commonPipelineEnvironment.container.imageNameTag)
assert.Equal(t, `{"cnbBuild":[{"dockerImage":"paketobuildpacks/builder:base"}]}`, commonPipelineEnvironment.custom.buildSettingsInfo)
assert.Equal(t, `{"cnbBuild":[{"dockerImage":"paketobuildpacks/builder-jammy-base:latest"}]}`, commonPipelineEnvironment.custom.buildSettingsInfo)
})

t.Run("prefers project descriptor", func(t *testing.T) {
Expand Down Expand Up @@ -620,7 +620,7 @@ uri = "some-buildpack"`))
assert.Equal(t, "folder", string(customData.Data[0].Path))
assert.Contains(t, customData.Data[0].AdditionalTags, "latest")
assert.Contains(t, customData.Data[0].BindingKeys, "SECRET")
assert.Equal(t, "paketobuildpacks/builder:base", customData.Data[0].Builder)
assert.Equal(t, "paketobuildpacks/builder-jammy-base:latest", customData.Data[0].Builder)

assert.Contains(t, customData.Data[0].Buildpacks.FromConfig, "paketobuildpacks/java")
assert.NotContains(t, customData.Data[0].Buildpacks.FromProjectDescriptor, "paketobuildpacks/java")
Expand Down
2 changes: 1 addition & 1 deletion resources/metadata/cnbBuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ spec:
- filePattern: "**/bom-*.xml"
type: sbom
containers:
- image: "paketobuildpacks/builder:base"
- image: "paketobuildpacks/builder-jammy-base:latest"
options:
- name: -u
value: "0"

0 comments on commit 0baa6a6

Please sign in to comment.