Skip to content

Commit

Permalink
fix: fixup the removal of bionic (#1054)
Browse files Browse the repository at this point in the history
- we don't need to node.js deps for noble as they are the
  same as for jammy and restoring the * in the stack line  means
  noble can use then as well.
- I had missed the strip-components field which is needed
- The version update script did not remove all mentions of bionic so
  remove them separately from the update to the Node.js versions
  supported
- the builpackless builder without jammy in the name uses bionic
  so remove it from the list of builders in integration.json

Signed-off-by: Michael Dawson <[email protected]>
  • Loading branch information
mhdawson authored Oct 31, 2024
1 parent 3a9df59 commit c9486df
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 72 deletions.
59 changes: 0 additions & 59 deletions buildpack.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,6 @@ api = "0.7"
[metadata.default-versions]
node = "20.*.*"

[[metadata.dependencies]]
checksum = "sha256:bc57445077a3fe6050da28b51b5d65f1528ead2f673bbcbe196bf7defa44cda4"
cpe = "cpe:2.3:a:nodejs:node.js:18.20.2:*:*:*:*:*:*:*"
deprecation_date = "2025-04-30T00:00:00Z"
id = "node"
licenses = ["0BSD", "Apache-2.0", "Artistic-2.0", "BSD-2-Clause", "BSD-3-Clause", "BSD-4-Clause", "BSD-Source-Code", "CC0-1.0", "ECL-2.0", "ICU", "MIT", "MIT-0", "SHL-0.5", "SHL-0.51", "Unicode-TOU"]
name = "Node Engine"
purl = "pkg:generic/[email protected]?checksum=d0584a21d83d710f947b210434449f6d2a65d14975d6fe9aaf430aae79dc312b&download_url=https://nodejs.org/dist/v18.20.2/node-v18.20.2-linux-x64.tar.xz"
source = "https://nodejs.org/dist/v18.20.2/node-v18.20.2-linux-x64.tar.xz"
source-checksum = "sha256:d0584a21d83d710f947b210434449f6d2a65d14975d6fe9aaf430aae79dc312b"
stacks = ["io.buildpacks.stacks.bionic"]
uri = "https://artifacts.paketo.io/node/node_v18.20.2_linux_x64_bionic_bc574450.tgz"
version = "18.20.2"

[[metadata.dependencies]]
checksum = "sha256:d0584a21d83d710f947b210434449f6d2a65d14975d6fe9aaf430aae79dc312b"
cpe = "cpe:2.3:a:nodejs:node.js:18.20.2:*:*:*:*:*:*:*"
Expand All @@ -45,20 +31,6 @@ api = "0.7"
uri = "https://nodejs.org/dist/v18.20.2/node-v18.20.2-linux-x64.tar.xz"
version = "18.20.2"

[[metadata.dependencies]]
checksum = "sha256:9b8a64df7b0fa13010a962f383c9fbbd4b94d7b5f7829e1f56a329498f8b7a0d"
cpe = "cpe:2.3:a:nodejs:node.js:18.20.3:*:*:*:*:*:*:*"
deprecation_date = "2025-04-30T00:00:00Z"
id = "node"
licenses = ["0BSD", "Apache-2.0", "Artistic-2.0", "BSD-2-Clause", "BSD-3-Clause", "BSD-4-Clause", "BSD-Source-Code", "CC0-1.0", "ECL-2.0", "ICU", "MIT", "MIT-0", "SHL-0.5", "SHL-0.51", "Unicode-TOU"]
name = "Node Engine"
purl = "pkg:generic/[email protected]?checksum=ffd6147c263b81016742dc1e72dc68885a3ca9b441d9744f9b76cad362d0cc5f&download_url=https://nodejs.org/dist/v18.20.3/node-v18.20.3-linux-x64.tar.xz"
source = "https://nodejs.org/dist/v18.20.3/node-v18.20.3-linux-x64.tar.xz"
source-checksum = "sha256:ffd6147c263b81016742dc1e72dc68885a3ca9b441d9744f9b76cad362d0cc5f"
stacks = ["io.buildpacks.stacks.bionic"]
uri = "https://artifacts.paketo.io/node/node_v18.20.3_linux_x64_bionic_9b8a64df.tgz"
version = "18.20.3"

[[metadata.dependencies]]
checksum = "sha256:ffd6147c263b81016742dc1e72dc68885a3ca9b441d9744f9b76cad362d0cc5f"
cpe = "cpe:2.3:a:nodejs:node.js:18.20.3:*:*:*:*:*:*:*"
Expand All @@ -74,20 +46,6 @@ api = "0.7"
uri = "https://nodejs.org/dist/v18.20.3/node-v18.20.3-linux-x64.tar.xz"
version = "18.20.3"

[[metadata.dependencies]]
checksum = "sha256:77ac64f65caa8c7b00f133ed68983956c08cfaddbaf3d47958709d7e642e5c4a"
cpe = "cpe:2.3:a:nodejs:node.js:20.14.0:*:*:*:*:*:*:*"
deprecation_date = "2026-04-30T00:00:00Z"
id = "node"
licenses = ["0BSD", "Apache-2.0", "Artistic-2.0", "BSD-2-Clause", "BSD-3-Clause", "BSD-4-Clause", "BSD-Source-Code", "CC0-1.0", "ECL-2.0", "ICU", "MIT", "MIT-0", "SHL-0.5", "SHL-0.51", "Unicode-TOU"]
name = "Node Engine"
purl = "pkg:generic/[email protected]?checksum=fedf8fa73b6f51c4ffcc5da8f86cd1ed381bc9dceae0829832c7d683a78b8e36&download_url=https://nodejs.org/dist/v20.14.0/node-v20.14.0-linux-x64.tar.xz"
source = "https://nodejs.org/dist/v20.14.0/node-v20.14.0-linux-x64.tar.xz"
source-checksum = "sha256:fedf8fa73b6f51c4ffcc5da8f86cd1ed381bc9dceae0829832c7d683a78b8e36"
stacks = ["io.buildpacks.stacks.bionic"]
uri = "https://artifacts.paketo.io/node/node_v20.14.0_linux_x64_bionic_77ac64f6.tgz"
version = "20.14.0"

[[metadata.dependencies]]
checksum = "sha256:fedf8fa73b6f51c4ffcc5da8f86cd1ed381bc9dceae0829832c7d683a78b8e36"
cpe = "cpe:2.3:a:nodejs:node.js:20.14.0:*:*:*:*:*:*:*"
Expand All @@ -103,20 +61,6 @@ api = "0.7"
uri = "https://nodejs.org/dist/v20.14.0/node-v20.14.0-linux-x64.tar.xz"
version = "20.14.0"

[[metadata.dependencies]]
checksum = "sha256:ba0a3c333eb782e98351b022461536d26dd8ca7b296606b9b22dec7e86938877"
cpe = "cpe:2.3:a:nodejs:node.js:20.15.0:*:*:*:*:*:*:*"
deprecation_date = "2026-04-30T00:00:00Z"
id = "node"
licenses = ["0BSD", "Apache-2.0", "Artistic-2.0", "BSD-2-Clause", "BSD-3-Clause", "BSD-4-Clause", "BSD-Source-Code", "CC0-1.0", "ECL-2.0", "ICU", "MIT", "MIT-0", "SHL-0.5", "SHL-0.51", "Unicode-TOU"]
name = "Node Engine"
purl = "pkg:generic/[email protected]?checksum=4f57f7828e6adb9f6bc77932f10e316cca68b0f160c82b21d9a2c7647c7f10bf&download_url=https://nodejs.org/dist/v20.15.0/node-v20.15.0-linux-x64.tar.xz"
source = "https://nodejs.org/dist/v20.15.0/node-v20.15.0-linux-x64.tar.xz"
source-checksum = "sha256:4f57f7828e6adb9f6bc77932f10e316cca68b0f160c82b21d9a2c7647c7f10bf"
stacks = ["io.buildpacks.stacks.bionic"]
uri = "https://artifacts.paketo.io/node/node_v20.15.0_linux_x64_bionic_ba0a3c33.tgz"
version = "20.15.0"

[[metadata.dependencies]]
checksum = "sha256:4f57f7828e6adb9f6bc77932f10e316cca68b0f160c82b21d9a2c7647c7f10bf"
cpe = "cpe:2.3:a:nodejs:node.js:20.15.0:*:*:*:*:*:*:*"
Expand Down Expand Up @@ -177,9 +121,6 @@ api = "0.7"
id = "node"
patches = 2

[[stacks]]
id = "io.buildpacks.stacks.bionic"

[[stacks]]
id = "io.buildpacks.stacks.jammy"

Expand Down
15 changes: 3 additions & 12 deletions dependency/retrieval/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -131,25 +131,16 @@ func createDependencyMetadata(release NodeRelease, releaseSchedule ReleaseSchedu
Checksum: fmt.Sprintf("sha256:%s", checksum),
Licenses: retrieve.LookupLicenses(url, upstream.DefaultDecompress),
DeprecationDate: deprecationDate,
Stacks: []string{"io.buildpacks.stacks.jammy"},
StripComponents: 1,
Stacks: []string{"io.buildpacks.stacks.jammy", "*"},
}

jammyDependency, err := versionology.NewDependency(dep, "jammy")
if err != nil {
return nil, fmt.Errorf("could get create jammy dependency: %w", err)
}

dep.Stacks = []string{"io.buildpacks.stacks.noble", "*"}
dep.URI = url
dep.Checksum = fmt.Sprintf("sha256:%s", checksum)
dep.StripComponents = 1

nobleDependency, err := versionology.NewDependency(dep, "noble")
if err != nil {
return nil, fmt.Errorf("could get create noble dependency: %w", err)
}

return []versionology.Dependency{jammyDependency, nobleDependency}, nil
return []versionology.Dependency{jammyDependency}, nil
}

func getDeprecationDate(version string, releaseSchedule ReleaseSchedule) *time.Time {
Expand Down
1 change: 0 additions & 1 deletion integration.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"build-plan": "github.com/paketo-community/build-plan",
"builders": [
"index.docker.io/paketobuildpacks/builder:buildpackless-base",
"index.docker.io/paketobuildpacks/builder-jammy-buildpackless-base:latest"
]
}

0 comments on commit c9486df

Please sign in to comment.