Skip to content

Commit

Permalink
Merge pull request #2 from Conjur-Enterprise/bump-deps
Browse files Browse the repository at this point in the history
CONJSE-1838: Update Postges and Nginx base images
  • Loading branch information
szh authored and GitHub Enterprise committed Feb 14, 2024
2 parents 63111c3 + 8f8b0fa commit 05af56b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
* @cyberark/community-and-integrations-team @conjurinc/community-and-integrations-team @conjurdemos/community-and-integrations-team
* @cyberark/community-and-integrations-team @conjurinc/community-and-integrations-team @conjurdemos/community-and-integrations-team @conjur-enterprise/community-and-integrations

# Changes to .trivyignore require Security Architect approval
.trivyignore @cyberark/security-architects @conjurinc/security-architects @conjurdemos/security-architects
.trivyignore @cyberark/security-architects @conjurinc/security-architects @conjurdemos/security-architects @conjur-enterprise/conjur-security

# Changes to .codeclimate.yml require Quality Architect approval
.codeclimate.yml @cyberark/quality-architects @conjurinc/quality-architects @conjurdemos/quality-architects
.codeclimate.yml @cyberark/quality-architects @conjurinc/quality-architects @conjurdemos/quality-architects @conjur-enterprise/conjur-quality

# Changes to SECURITY.md require Security Architect approval
SECURITY.md @cyberark/security-architects @conjurinc/security-architects @conjurdemos/security-architects
SECURITY.md @cyberark/security-architects @conjurinc/security-architects @conjurdemos/security-architects @conjur-enterprise/conjur-security
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ services:
restart: on-failure

database:
image: postgres:10.16
image: postgres:15
container_name: postgres_database
environment:
POSTGRES_HOST_AUTH_METHOD: password
Expand Down Expand Up @@ -66,7 +66,7 @@ services:
- 8080:80

proxy:
image: nginx:1.13.6-alpine
image: nginx:latest
container_name: nginx_proxy
ports:
- "8443:443"
Expand Down

0 comments on commit 05af56b

Please sign in to comment.