Skip to content

Commit 8f325e4

Browse files
Updating version for nginx for 1.31.X (#424)
* Add nginx 1.31.2 for stack(s) cflinuxfs4, cflinuxfs5 * Add nginx v1.31.x line to default_test.go * Update default_test.go * Update default_test.go * Update fixture override.yml --------- Co-authored-by: Tsvetelina Marinova <ivanovac@gmail.com>
1 parent 7c982c2 commit 8f325e4

3 files changed

Lines changed: 23 additions & 7 deletions

File tree

fixtures/util/override_buildpack/override.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
version_lines:
2-
mainline: 1.29.999
2+
mainline: 1.31.999
33
nginx:
44
dependencies:
55
- name: nginx
6-
version: 1.29.999
7-
uri: https://buildpacks.cloudfoundry.org/dependencies/nginx/nginx-1.29.999-linux-x64.tgz
6+
version: 1.31.999
7+
uri: https://buildpacks.cloudfoundry.org/dependencies/nginx/nginx-1.31.999-linux-x64.tgz
88
file: BUILDPACK_DIR/nginx.tgz
99
sha256: 062d906c87839d03b243e2821e10653c89b4c92878bfe2bf995dec231e117bfc
1010
cf_stacks:

manifest.yml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ default_versions:
44
- name: nginx
55
version: 1.29.x
66
version_lines:
7-
mainline: 1.29.x
7+
mainline: 1.31.x
88
stable: 1.30.x
99
dependency_deprecation_dates:
1010
dependencies:
@@ -56,6 +56,22 @@ dependencies:
5656
- cflinuxfs5
5757
source: http://nginx.org/download/nginx-1.30.3.tar.gz
5858
source_sha256: e5823dc6f45610993def93ebf6cfce68264af4958c77e874b7d20f3709001b8f
59+
- name: nginx
60+
version: 1.31.2
61+
uri: https://buildpacks.cloudfoundry.org/dependencies/nginx/nginx_1.31.2_linux_x64_cflinuxfs4_b837d5de.tgz
62+
sha256: b837d5de6e64178355e42ab6f7a6a5fdd0c61ce146780e3bd0da9ee93c4011fa
63+
cf_stacks:
64+
- cflinuxfs4
65+
source: http://nginx.org/download/nginx-1.31.2.tar.gz
66+
source_sha256: af2a957c41da636ddc4f883e4523c6d140b4784dbce42000c364ae5092aa473c
67+
- name: nginx
68+
version: 1.31.2
69+
uri: https://buildpacks.cloudfoundry.org/dependencies/nginx/nginx_1.31.2_linux_x64_cflinuxfs5_9ecc8fa6.tgz
70+
sha256: 9ecc8fa62fb89b52b4057e95ad383dd29ced8a188241e71efa2fb295c28f5efd
71+
cf_stacks:
72+
- cflinuxfs5
73+
source: http://nginx.org/download/nginx-1.31.2.tar.gz
74+
source_sha256: af2a957c41da636ddc4f883e4523c6d140b4784dbce42000c364ae5092aa473c
5975
- name: openresty
6076
version: 1.21.4.4
6177
uri: https://buildpacks.cloudfoundry.org/dependencies/openresty/openresty_1.21.4.4_linux_x64_cflinuxfs3_9ade85e8.tgz

src/nginx/integration/default_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ func testDefault(platform switchblade.Platform, fixtures string) func(*testing.T
114114
Execute(name, filepath.Join(fixtures, "default", "unspecified_version"))
115115
Expect(err).NotTo(HaveOccurred())
116116

117-
Eventually(logs).Should(ContainSubstring(`No nginx version specified - using mainline => 1.29.`))
117+
Eventually(logs).Should(ContainSubstring(`No nginx version specified - using mainline => 1.31.`))
118118
Eventually(logs).ShouldNot(ContainSubstring(`Requested nginx version:`))
119119

120120
Eventually(deployment).Should(Serve(ContainSubstring("Exciting Content")))
@@ -133,7 +133,7 @@ func testDefault(platform switchblade.Platform, fixtures string) func(*testing.T
133133
Execute(name, filepath.Join(fixtures, "default", "mainline"))
134134
Expect(err).NotTo(HaveOccurred())
135135

136-
Eventually(logs).Should(ContainSubstring(`Requested nginx version: mainline => 1.29.`))
136+
Eventually(logs).Should(ContainSubstring(`Requested nginx version: mainline => 1.31.`))
137137

138138
Eventually(deployment).Should(Serve(ContainSubstring("Exciting Content")))
139139

@@ -170,7 +170,7 @@ func testDefault(platform switchblade.Platform, fixtures string) func(*testing.T
170170
Execute(name, filepath.Join(fixtures, "default", "unavailable_version"))
171171
Expect(err).To(HaveOccurred())
172172

173-
Eventually(logs).Should(ContainSubstring(`Available versions: mainline, stable, 1.29.x, 1.30.x`))
173+
Eventually(logs).Should(ContainSubstring(`Available versions: mainline, stable, 1.30.x, 1.31.x`))
174174
})
175175
})
176176

0 commit comments

Comments
 (0)