jenkins/sap-jenkins-library
1
0
Fork 0
mirror of https://github.com/SAP/jenkins-library.git synced 2025-01-16 05:16:08 +02:00
Code Issues Releases Activity

feat(cnbBuild): Use Paketo Jammy builder as default (#4694)

Browse Source
This commit is contained in:
Pavel Busko 2023-11-23 13:37:19 +01:00 committed by GitHub
parent 0006f10918
commit 0baa6a6fcb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/cnbBuild_generated.go
View File

@ -519,7 +519,7 @@ func cnbBuildMetadata() config.StepData {
},
},
Containers: []config.Container{
{Image: "paketobuildpacks/builder:base", Options: []config.Option{{Name: "-u", Value: "0"}}},
{Image: "paketobuildpacks/builder-jammy-base:latest", Options: []config.Option{{Name: "-u", Value: "0"}}},
},
Outputs: config.StepOutputs{
Resources: []config.StepResources{

4
cmd/cnbBuild_test.go
View File

@ -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) {
@ -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")

2
resources/metadata/cnbBuild.yaml
View File

@ -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"