Skip to content

Commit

Permalink
Updates buildpack.toml with 1.25 -> 1.27 (#787)
Browse files Browse the repository at this point in the history
  • Loading branch information
@paketo-bot
paketo-bot authored Jun 27, 2024
1 parent bc0c12a commit 6ce169e
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 46 deletions.
60 changes: 17 additions & 43 deletions buildpack.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,59 +12,33 @@ api = "0.7"
include-files = ["bin/build", "bin/detect", "bin/run", "bin/configure", "buildpack.toml"]
pre-package = "./scripts/build.sh"
[metadata.default-versions]
nginx = "1.25.*"
nginx = "1.27.*"

[[metadata.dependencies]]
checksum = "sha256:12775fe60e83b5a3a93b124654ea176f21bf750190d45641317ff2b48637bb35"
cpe = "cpe:2.3:a:nginx:nginx:1.25.4:*:*:*:*:*:*:*"
checksum = "sha256:b41783e9cfecacf228a19290741c66b21549daa8f9aaeffef59b4bf0d74d1e0d"
cpe = "cpe:2.3:a:nginx:nginx:1.27.0:*:*:*:*:*:*:*"
id = "nginx"
licenses = ["BSD-2-Clause"]
name = "Nginx Server"
purl = "pkg:generic/nginx@1.25.4?checksum=760729901acbaa517996e681ee6ea259032985e37c2768beef80df3a877deed9&download_url=https://nginx.org/download/nginx-1.25.4.tar.gz"
source = "https://nginx.org/download/nginx-1.25.4.tar.gz"
source-checksum = "sha256:760729901acbaa517996e681ee6ea259032985e37c2768beef80df3a877deed9"
purl = "pkg:generic/nginx@1.27.0?checksum=b7230e3cf87eaa2d4b0bc56aadc920a960c7873b9991a1b66ffcc08fc650129c&download_url=https://nginx.org/download/nginx-1.27.0.tar.gz"
source = "https://nginx.org/download/nginx-1.27.0.tar.gz"
source-checksum = "sha256:b7230e3cf87eaa2d4b0bc56aadc920a960c7873b9991a1b66ffcc08fc650129c"
stacks = ["io.buildpacks.stacks.bionic"]
uri = "https://artifacts.paketo.io/nginx/nginx_1.25.4_linux_x64_bionic_12775fe6.tgz"
version = "1.25.4"
uri = "https://artifacts.paketo.io/nginx/nginx_1.27.0_linux_x64_bionic_b41783e9.tgz"
version = "1.27.0"

[[metadata.dependencies]]
checksum = "sha256:6d24754aecb502245f2fd3a06e1a8fadccef3fed2285a050f495e1219a285a1c"
cpe = "cpe:2.3:a:nginx:nginx:1.25.4:*:*:*:*:*:*:*"
checksum = "sha256:a1c92ac0b4aa06b8b0306e18b6e656f32040efca436935dc952a142b26fb96c0"
cpe = "cpe:2.3:a:nginx:nginx:1.27.0:*:*:*:*:*:*:*"
id = "nginx"
licenses = ["BSD-2-Clause"]
name = "Nginx Server"
purl = "pkg:generic/nginx@1.25.4?checksum=760729901acbaa517996e681ee6ea259032985e37c2768beef80df3a877deed9&download_url=https://nginx.org/download/nginx-1.25.4.tar.gz"
source = "https://nginx.org/download/nginx-1.25.4.tar.gz"
source-checksum = "sha256:760729901acbaa517996e681ee6ea259032985e37c2768beef80df3a877deed9"
purl = "pkg:generic/nginx@1.27.0?checksum=b7230e3cf87eaa2d4b0bc56aadc920a960c7873b9991a1b66ffcc08fc650129c&download_url=https://nginx.org/download/nginx-1.27.0.tar.gz"
source = "https://nginx.org/download/nginx-1.27.0.tar.gz"
source-checksum = "sha256:b7230e3cf87eaa2d4b0bc56aadc920a960c7873b9991a1b66ffcc08fc650129c"
stacks = ["io.buildpacks.stacks.jammy"]
uri = "https://artifacts.paketo.io/nginx/nginx_1.25.4_linux_x64_jammy_6d24754a.tgz"
version = "1.25.4"

[[metadata.dependencies]]
checksum = "sha256:955da83b7c4ce9f840a5138cd277cc92bbde32205154d1c0c028f2fa3a2579ec"
cpe = "cpe:2.3:a:nginx:nginx:1.25.5:*:*:*:*:*:*:*"
id = "nginx"
licenses = ["BSD-2-Clause"]
name = "Nginx Server"
purl = "pkg:generic/[email protected]?checksum=2fe2294f8af4144e7e842eaea884182a84ee7970e11046ba98194400902bbec0&download_url=https://nginx.org/download/nginx-1.25.5.tar.gz"
source = "https://nginx.org/download/nginx-1.25.5.tar.gz"
source-checksum = "sha256:2fe2294f8af4144e7e842eaea884182a84ee7970e11046ba98194400902bbec0"
stacks = ["io.buildpacks.stacks.bionic"]
uri = "https://artifacts.paketo.io/nginx/nginx_1.25.5_linux_x64_bionic_955da83b.tgz"
version = "1.25.5"

[[metadata.dependencies]]
checksum = "sha256:ce1f1d6a126050429633a4d61a39473a579a7109c13b0c440d820ad14dbd86fd"
cpe = "cpe:2.3:a:nginx:nginx:1.25.5:*:*:*:*:*:*:*"
id = "nginx"
licenses = ["BSD-2-Clause"]
name = "Nginx Server"
purl = "pkg:generic/[email protected]?checksum=2fe2294f8af4144e7e842eaea884182a84ee7970e11046ba98194400902bbec0&download_url=https://nginx.org/download/nginx-1.25.5.tar.gz"
source = "https://nginx.org/download/nginx-1.25.5.tar.gz"
source-checksum = "sha256:2fe2294f8af4144e7e842eaea884182a84ee7970e11046ba98194400902bbec0"
stacks = ["io.buildpacks.stacks.jammy"]
uri = "https://artifacts.paketo.io/nginx/nginx_1.25.5_linux_x64_jammy_ce1f1d6a.tgz"
version = "1.25.5"
uri = "https://artifacts.paketo.io/nginx/nginx_1.27.0_linux_x64_jammy_a1c92ac0.tgz"
version = "1.27.0"

[[metadata.dependencies]]
checksum = "sha256:af58bf806b74fe14d8a69653da066b625c8f5a15c9dc4697bc4a217166290ca5"
Expand Down Expand Up @@ -119,7 +93,7 @@ api = "0.7"
version = "1.26.1"

[[metadata.dependency-constraints]]
constraint = "1.25.*"
constraint = "1.27.*"
id = "nginx"
patches = 2

Expand All @@ -128,7 +102,7 @@ api = "0.7"
id = "nginx"
patches = 2
[metadata.version-lines]
mainline = "1.25.*"
mainline = "1.27.*"
stable = "1.26.*"

[[stacks]]
Expand Down
6 changes: 3 additions & 3 deletions integration/logging_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ func testLogging(t *testing.T, context spec.G, it spec.S) {
fmt.Sprintf("%s 1.2.3", settings.Buildpack.Name),
" Resolving Nginx Server version",
" Candidate version sources (in priority order):",
` buildpack.yml -> "1.25.*"`,
` buildpack.yml -> "1.27.*"`,
))
Expect(logs).To(matchers.ContainLines(
MatchRegexp(` Selected Nginx Server version \(using buildpack\.yml\): 1\.25\.\d+`),
MatchRegexp(` Selected Nginx Server version \(using buildpack\.yml\): 1\.27\.\d+`),
))
Expect(logs).To(matchers.ContainLines(
" WARNING: Setting the server version through buildpack.yml will be deprecated soon in Nginx Server Buildpack v2.0.0.",
Expand Down Expand Up @@ -100,7 +100,7 @@ func testLogging(t *testing.T, context spec.G, it spec.S) {
" Resolving Nginx Server version",
" Candidate version sources (in priority order):",
` BP_NGINX_VERSION -> "1.26.*"`,
` buildpack.yml -> "1.25.*"`,
` buildpack.yml -> "1.27.*"`,
))
Expect(logs).To(matchers.ContainLines(
MatchRegexp(` Selected Nginx Server version \(using BP_NGINX_VERSION\): 1\.26\.\d+`),
Expand Down

0 comments on commit 6ce169e

Please sign in to comment.