Skip to content

Commit e6f9156

Browse files
authored
Merge pull request #118 from cyberark/upgrade-nginx-branch
Upgrade nginx to 1.24
2 parents 4740b10 + f7d5879 commit e6f9156

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
55
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
66

77
## [Unreleased]
8+
9+
### Security
10+
- Update nginx to 1.24 in Dockerfile.nginx
11+
[cyberark/conjur-api-java#118](https://github.com/cyberark/conjur-api-java/issues/118)
12+
813
### Changed
914
- Avoid calling `login` for host
1015
[cyberark/conjur-api-java#117](https://github.com/cyberark/conjur-api-java/pull/117)

Dockerfile.nginx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM nginx:1.23.3
1+
FROM nginx:1.24
22

33
MAINTAINER Conjur Inc
44

0 commit comments

Comments
 (0)