Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 1.23.3

* Upgrade to nginx 1.23.3.

## 1.19.5

* Upgrade to nginx 1.19.5.
Expand Down
2 changes: 1 addition & 1 deletion CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @Intellection/devops
* @Intellection/sre
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM nginx:1.19.5-alpine
FROM nginx:1.23.3-alpine

ENV NGINX_ENTRYPOINT_QUIET_LOGS=1

Expand Down
3 changes: 1 addition & 2 deletions config/default.conf
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
server {
listen 8080;
listen 80;
server_name localhost;

#charset koi8-r;
#access_log /var/log/nginx/host.access.log main;

location / {
Expand Down
3 changes: 2 additions & 1 deletion config/nginx.conf
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
user nginx;
worker_processes auto;

error_log /var/log/nginx/error.log warn;
error_log /var/log/nginx/error.log notice;
pid /var/run/nginx.pid;


Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ services:
image: nginx
build: .
ports:
- "8080:8080"
- "80:8080"