Skip to content

Commit

Permalink
Removes nginx 1.17 due to EOL
Browse files Browse the repository at this point in the history
set mainline version to 1.19.x and stable to 1.18.x

Signed-off-by: Arjun Sreedharan <[email protected]>
  • Loading branch information
Frankie Gallina-Jones authored and arjun024 committed Aug 10, 2020
1 parent 5d722ce commit c29fae0
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 34 deletions.
34 changes: 3 additions & 31 deletions buildpack.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,29 +9,7 @@ api = "0.2"
include_files = ["bin/build", "bin/detect", "bin/run", "bin/configure", "buildpack.toml"]
pre_package = "./scripts/build.sh"
[metadata.default-versions]
nginx = "1.17.*"

[[metadata.dependencies]]
deprecation_date = "2020-05-01T00:00:00Z"
id = "nginx"
name = "Nginx Server"
sha256 = "c072d5dcb1f4efbd757d728dd2778261c070724e060bdeaca89cdfee9e15b0a9"
source = "http://nginx.org/download/nginx-1.17.9.tar.gz"
source_sha256 = "7dd65d405c753c41b7fdab9415cfb4bdbaf093ec6d9f7432072d52cb7bcbb689"
stacks = ["io.buildpacks.stacks.bionic", "org.cloudfoundry.stacks.cflinuxfs3"]
uri = "https://buildpacks.cloudfoundry.org/dependencies/nginx/nginx_1.17.9_linux_x64_cflinuxfs3_c072d5dc.tgz"
version = "1.17.9"

[[metadata.dependencies]]
deprecation_date = "2020-05-01T00:00:00Z"
id = "nginx"
name = "Nginx Server"
sha256 = "2fe87dae65967cfbbc570f986aa52fc574d6555c71799f2a781487d96c59d26d"
source = "http://nginx.org/download/nginx-1.17.10.tar.gz"
source_sha256 = "a9aa73f19c352a6b166d78e2a664bb3ef1295bbe6d3cc5aa7404bd4664ab4b83"
stacks = ["io.buildpacks.stacks.bionic", "org.cloudfoundry.stacks.cflinuxfs3"]
uri = "https://buildpacks.cloudfoundry.org/dependencies/nginx/nginx_1.17.10_linux_x64_cflinuxfs3_2fe87dae.tgz"
version = "1.17.10"
nginx = "1.19.*"

[[metadata.dependencies]]
deprecation_date = "2021-05-01T00:00:00Z"
Expand Down Expand Up @@ -66,20 +44,14 @@ api = "0.2"
uri = "https://buildpacks.cloudfoundry.org/dependencies/nginx/nginx_1.19.1_linux_x64_cflinuxfs3_b5af01b0.tgz"
version = "1.19.1"

[[metadata.dependency_deprecation_dates]]
date = 2020-05-01T00:00:00Z
link = "https://nginx.org/"
name = "nginx"
version_line = "1.17.x"

[[metadata.dependency_deprecation_dates]]
date = 2021-05-01T00:00:00Z
link = "https://nginx.org/"
name = "nginx"
version_line = "1.18.x"
[metadata.version-lines]
mainline = "1.18.*"
stable = "1.17.*"
mainline = "1.19.*"
stable = "1.18.*"

[[stacks]]
id = "io.buildpacks.stacks.bionic"
Expand Down
6 changes: 3 additions & 3 deletions integration/logging_test.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package integration

import (
"os"
"fmt"
"os"
"path/filepath"
"strings"
"testing"
Expand Down Expand Up @@ -61,9 +61,9 @@ func testLogging(t *testing.T, when spec.G, it spec.S) {
fmt.Sprintf("%s %s", buildpackInfo.Buildpack.Name, buildpackVersion),
" Resolving Nginx Server version",
" Candidate version sources (in priority order):",
` buildpack.yml -> "1.18.*"`,
` buildpack.yml -> "1.19.*"`,
"",
MatchRegexp(` Selected Nginx Server version \(using buildpack\.yml\): 1\.18\.\d+`),
MatchRegexp(` Selected Nginx Server version \(using buildpack\.yml\): 1\.19\.\d+`),
"",
" Executing build process",
MatchRegexp(` Installing Nginx Server \d+\.\d+\.\d+`),
Expand Down

0 comments on commit c29fae0

Please sign in to comment.