Skip to content

Commit

Permalink
version bumped nginx version used in deployments; configure server_to…
Browse files Browse the repository at this point in the history
…kens off
  • Loading branch information
thjaeckle committed Apr 30, 2024
1 parent 3aca212 commit 79cafdc
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion deployment/docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ services:
max-size: 10m

nginx:
image: docker.io/nginx:1.21-alpine
image: docker.io/nginx:1.26-alpine
deploy:
resources:
limits:
Expand Down
1 change: 1 addition & 0 deletions deployment/docker/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ http {
include /etc/nginx/mime.types;
charset utf-8;
default_type application/json;
server_tokens off;

# timeouts are configured slightly higher than gateway read-timeout of 60 seconds
proxy_connect_timeout 70; # seconds, default: 60
Expand Down
2 changes: 1 addition & 1 deletion deployment/docker/sandbox/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ services:
# - ./nodered/flows-ditto.json:/data/flows-ditto.json:rw

nginx:
image: docker.io/nginx:1.21-alpine
image: docker.io/nginx:1.26-alpine
deploy:
resources:
limits:
Expand Down
1 change: 1 addition & 0 deletions deployment/docker/sandbox/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ http {
charset utf-8;
default_type application/json;
include mime.types;
server_tokens off;

# timeouts are configured slightly higher than gateway read-timeout of 60 seconds
proxy_connect_timeout 70; # seconds, default: 60
Expand Down
1 change: 1 addition & 0 deletions deployment/helm/ditto/templates/nginx-configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ data:
charset utf-8;
default_type application/json;
include mime.types;
server_tokens off;
# timeouts are configured slightly higher than ditto-eclipse-ditto-gateway read-timeout of 60 seconds
proxy_connect_timeout 70; # seconds, default: 60
Expand Down
2 changes: 1 addition & 1 deletion deployment/kubernetes/deploymentFiles/nginx/nginx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ spec:
done
containers:
- name: nginx
image: docker.io/nginx:1.21-alpine
image: docker.io/nginx:1.26-alpine
volumeMounts:
- name: nginx-conf
mountPath: /etc/nginx/nginx.conf
Expand Down

0 comments on commit 79cafdc

Please sign in to comment.