Merge pull request #118 from cyberark/upgrade-nginx-branch

Upgrade nginx to 1.24
cyberark · May 24, 2023 · e6f9156 · e6f9156
2 parents 4740b10 + f7d5879
commit e6f9156
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+
+### Security
+- Update nginx to 1.24 in Dockerfile.nginx
+  [cyberark/conjur-api-java#118](https://github.com/cyberark/conjur-api-java/issues/118)
+
 ### Changed
 - Avoid calling `login` for host
   [cyberark/conjur-api-java#117](https://github.com/cyberark/conjur-api-java/pull/117)

diff --git a/Dockerfile.nginx b/Dockerfile.nginx
@@ -1,4 +1,4 @@
-FROM nginx:1.23.3
+FROM nginx:1.24
 
 MAINTAINER Conjur Inc