Skip to content

Commit 1d53a0f

Browse files
authored
Merge pull request #1261 from PokeAPI/gql-admin-fix
Use resolved upstream
2 parents 0ae8b4e + fbaa217 commit 1d53a0f

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

Resources/nginx/nginx.conf

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ http {
4141
gzip_min_length 256;
4242
gzip_types application/atom+xml application/geo+json application/javascript application/x-javascript application/json application/ld+json application/manifest+json application/rdf+xml application/rss+xml application/xhtml+xml application/xml font/eot font/otf font/ttf image/svg+xml text/css text/javascript text/plain text/xml;
4343

44-
resolver 127.0.0.11 valid=30s;
44+
resolver 127.0.0.11 valid=10s;
4545

4646
geo $limit {
4747
default 1;
@@ -68,6 +68,11 @@ http {
6868
limit_conn_zone $binary_remote_addr zone=addr:20m;
6969
proxy_cache_path /tmp/cache levels=1:2 keys_zone=small:40m inactive=10d max_size=2g use_temp_path=off;
7070

71+
upstream gqle {
72+
zone upstream_dynamic 64k;
73+
server graphql-engine:8080 resolve;
74+
}
75+
7176
server {
7277
listen 80 deferred;
7378
server_name _;
@@ -92,7 +97,7 @@ http {
9297
proxy_set_header Host $http_host;
9398
proxy_redirect off;
9499
set $upstream_graphql graphql-engine;
95-
proxy_pass http://$upstream_graphql:8080/;
100+
proxy_pass http://gqle/;
96101
}
97102

98103
location /graphql/console {

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ services:
5151
- ./Resources/nginx/ssl:/ssl:ro
5252
- graphql_cache:/tmp/cache
5353
graphql-engine:
54-
image: hasura/graphql-engine:v2.45.1
54+
image: hasura/graphql-engine:v2.48.1
5555
ports:
5656
- "8080:8080"
5757
depends_on:

0 commit comments

Comments
 (0)