Merge pull request #662 from PokeAPI/compose

Author: Naramsim

Makefile

@@ -4,7 +4,7 @@ docker_config = --settings=config.docker-compose
 HASURA_GRAPHQL_ADMIN_SECRET=pokemon
 
 .PHONY: help
-.SILENT: 
+.SILENT:
 
 help:
 	@grep -E '^[a-zA-Z_-]+:.*?# .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?# "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
@@ -67,6 +67,9 @@ docker-stop:  # (Docker) Stop containers
 docker-down:  # (Docker) Stop and removes containers and networks
 	docker-compose down
 
+docker-prod:
+	docker-compose -f docker-compose.yml -f Resources/compose/docker-compose-prod-graphql.yml up -d
+
 docker-setup: docker-up docker-migrate docker-build-db  # (Docker) Start services, prepare the latest DB schema, populate the DB
 
 format:  # Format the source code
@@ -114,4 +117,4 @@ k8s-build-db:  # (k8s) Build the database
 	kubectl exec --namespace pokeapi deployment/pokeapi -- sh -c 'echo "from data.v2.build import build_all; build_all()" | python manage.py shell --settings=config.docker-compose'
 
 k8s-delete:  # (k8s) Delete pokeapi namespace
-	kubectl delete namespace pokeapi
+	kubectl delete namespace pokeapi

README.md

@@ -96,7 +96,7 @@ When you start PokéAPI with the above docker-compose setup, an [Hasura Engine](
 
 ```sh
 # hasura cli needs to be installed and available in your $PATH: https://hasura.io/docs/latest/graphql/core/hasura-cli/install-hasura-cli.html
-# hasura cli's version has to be v2.0.0-alpha.5
+# hasura cli's version has to be v2.0.8
 make hasura-apply
 ```
 

Resources/compose/docker-compose-prod-graphql.yml

@@ -4,7 +4,7 @@ services:
     environment:
       POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}"
       POSTGRES_USER: "${POSTGRES_USER}"
-    
+
   app:
     env_file: .env
 
@@ -13,19 +13,24 @@ services:
       - graphiql:/public-console:ro
 
   graphql-engine:
+    cpus: 0.7
+    memswap_limit: 3g
+    mem_limit: 700m
     environment:
       HASURA_GRAPHQL_DATABASE_URL: "postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db:5432/${POSTGRES_DB:-pokeapi}"
       HASURA_GRAPHQL_ADMIN_SECRET: "${HASURA_GRAPHQL_ADMIN_SECRET}"
+      HASURA_GRAPHQL_SCHEMA_SYNC_POLL_INTERVAL: 0
+      HASURA_GRAPHQL_EVENTS_HTTP_POOL_SIZE: 10
 
   graphiql:
     image: pokeapi/graphiql:1.0.1
     command: sh -c 'cp -a /app/static/. /transfer/ && tail -f /etc/passwd'
     volumes:
       - graphiql:/transfer
-    depends_on: 
+    depends_on:
       - graphql-engine
 
-volumes: 
+volumes:
   graphiql:
 
-# docker-compose -f docker-compose.yml -f Resources/compose/docker-compose-graphql.yml up
+# docker-compose -f docker-compose.yml -f Resources/compose/docker-compose-prod-graphql.yml up -d

Resources/k8s/kustomize/base/jobs/load-graphql.yaml

@@ -30,7 +30,7 @@ spec:
             - apt-get update &&
               apt-get install -y git curl &&
               curl -L https://github.com/hasura/graphql-engine/raw/stable/cli/get.sh | bash &&
-              hasura update-cli --version v2.0.0-alpha.5 &&
+              hasura update-cli --version v2.0.8 &&
               git clone https://github.com/PokeAPI/pokeapi.git &&
               cd pokeapi &&
               git checkout staging &&

Resources/nginx/nginx.conf

@@ -1,7 +1,7 @@
-worker_processes  2;
+worker_processes  1;
 
 events {
-    worker_connections  4096;
+    worker_connections  1024;
     multi_accept on; # accept each connection as soon as you can
     accept_mutex off;
     use epoll;
@@ -24,21 +24,18 @@ http {
     tcp_nodelay     on;
 
     keepalive_timeout 5;
-    
+
     gzip on;
     gzip_disable "msi6";
     gzip_vary on;
     gzip_proxied any;
-    gzip_comp_level 6;
+    gzip_comp_level 4;
     gzip_buffers 16 8k;
     gzip_http_version 1.1;
     gzip_min_length 256;
     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;
 
-    upstream pokeapi_upstream {
-        # 'app' is the Django container name in Docker
-        server app:80 fail_timeout=0;
-    }
+    resolver 127.0.0.11 valid=30s;
 
     upstream graphql_upstream {
         server graphql-engine:8080 fail_timeout=0;
@@ -57,6 +54,7 @@ http {
 
     limit_req_zone $limit_key zone=graphqlDefaultLimit:50m rate=1r/m;
     limit_conn_zone $binary_remote_addr zone=addr:20m;
+    proxy_cache_path /tmp/cache levels=1:2 keys_zone=small:40m inactive=10d max_size=2g use_temp_path=off;
 
     server {
         listen 80 deferred;
@@ -91,11 +89,18 @@ http {
         }
 
         location /graphql/v1beta {
+            # proxy_cache small;
+            # proxy_cache_valid 200 10d;
+            # proxy_cache_valid any 0;
+            # proxy_cache_methods POST;
+            # proxy_cache_key "$request_method$request_uri$request_body";
             limit_req zone=graphqlDefaultLimit burst=100 nodelay;
             limit_req_status 429;
-            expires 1m; # client-side caching, one minute for each API resource
+            expires 30m; # client-side caching, one minute for each API resource
             add_header Cache-Control "public";
             add_header Pragma public;
+            # add_header X-Proxy-Cache $upstream_cache_status;
+            # add_header X-Cache-Date $upstream_http_date;
             proxy_http_version 1.1;
             proxy_set_header Upgrade $http_upgrade;
             proxy_set_header Connection "upgrade";
@@ -105,7 +110,7 @@ http {
             proxy_redirect off;
             proxy_pass http://graphql_upstream/v1/graphql;
         }
-        
+
         location /api/ {
             expires 1m; # client-side caching, one minute for each API resource
             add_header Cache-Control "public";
@@ -114,15 +119,12 @@ http {
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_set_header Host $http_host;
             proxy_redirect off;
-            proxy_pass http://pokeapi_upstream;
+            set $upstream app;
+            proxy_pass http://$upstream:80;
         }
 
         location / {
-            proxy_set_header X-Real-IP $remote_addr;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header Host $http_host;
-            proxy_redirect off;
-            proxy_pass http://pokeapi_upstream;
+            return 404;
         }
     }
 }

Resources/nginx/ssl/ssh.sample.conf Resources/nginx/ssl/ssl.sample.confResources/nginx/ssl/ssh.sample.conf renamed to Resources/nginx/ssl/ssl.sample.conf

@@ -0,0 +1,9 @@
+version: '2.4'
+
+services:
+  app:
+    build:
+      context: .
+      dockerfile: ./Resources/docker/app/Dockerfile
+
+# # docker-compose -f docker-compose.yml -f Resources/compose/docker-compose-dev.yml up -d

docker-compose-dev.yml

@@ -17,9 +17,7 @@ services:
     restart: always
 
   app:
-    build:
-      context: .
-      dockerfile: ./Resources/docker/app/Dockerfile
+    image: pokeapi/pokeapi:master
     user: ${RUN_AS:-pokeapi}
     environment:
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-pokemon}
@@ -45,13 +43,9 @@ services:
     volumes:
       - ./Resources/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
       - ./Resources/nginx/ssl:/ssl:ro
-    volumes_from:
-      - app:ro
-    links:
-      - app
-
+      - graphql_cache:/tmp/cache
   graphql-engine:
-    image: hasura/graphql-engine:v2.0.0-alpha.5
+    image: hasura/graphql-engine:v2.0.8
     ports:
       - "8080:8080"
     depends_on:
@@ -61,6 +55,7 @@ services:
       HASURA_GRAPHQL_DATABASE_URL: postgres://${POSTGRES_USER:-ash}:${POSTGRES_PASSWORD:-pokemon}@db:5432/${POSTGRES_DB:-pokeapi}
       HASURA_GRAPHQL_ENABLE_CONSOLE: "true"
       HASURA_GRAPHQL_DEV_MODE: "false"
+      HASURA_GRAPHQL_LOG_LEVEL: "warn"
       HASURA_GRAPHQL_ENABLED_LOG_TYPES: startup, http-log, webhook-log, websocket-log, query-log
       HASURA_GRAPHQL_ADMIN_SECRET: ${HASURA_GRAPHQL_ADMIN_SECRET:-pokemon}
       HASURA_GRAPHQL_UNAUTHORIZED_ROLE: anon
@@ -70,3 +65,4 @@ services:
 volumes:
   pg_data:
   redis_data:
+  graphql_cache:

docker-compose.yml

@@ -1,2 +0,0 @@
-
-

graphql/metadata/actions.graphql

@@ -4,9 +4,12 @@
     connection_info:
       database_url:
         from_env: HASURA_GRAPHQL_DATABASE_URL
+      isolation_level: read-committed
       pool_settings:
-        idle_timeout: 180
-        max_connections: 50
+        idle_timeout: 20
+        max_connections: 10
         retries: 1
+        pool_timeout: 60
+        connection_lifetime: 60
+      use_prepared_statements: false
   tables: "!include default/tables/tables.yaml"
-  functions: "!include default/functions/functions.yaml"