Merge branch 'master' into ability-name

Makefile

@@ -68,7 +68,7 @@ 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-compose -f docker-compose.yml -f docker-compose.override.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
 

README.md

@@ -20,7 +20,7 @@ A RESTful API for Pokémon - [pokeapi.co](https://pokeapi.co)
 
 > Beta GraphQL support is rolling out! Check out the [GraphQL paragraph](#graphql--) for more info.
 
-## Setup   [![pyVersion37](https://img.shields.io/badge/python-3.7-blue.svg)](https://www.python.org/download/releases/3.7/)
+## Setup   [![pyVersion310](https://img.shields.io/badge/python-3.10-blue.svg)](https://www.python.org/download/releases/3.10/)
 
 - Download this source code into a working directory, be sure to use the flag `--recurse-submodules` to clone also our submodules.
 

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

@@ -1,19 +1,25 @@
 version: '2.4'
 services:
+  cache:
+    image: redis:7.0.7-alpine
   db:
+    image: postgres:15.1
     environment:
       POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}"
       POSTGRES_USER: "${POSTGRES_USER}"
 
   app:
+    image: pokeapi/pokeapi:master
     env_file: .env
     restart: "no"
 
   web:
+    image: nginx:1.23.3-alpine
     volumes:
       - graphiql:/public-console:ro
 
   graphql-engine:
+    image: hasura/graphql-engine:v2.16.1
     cpus: 0.7
     memswap_limit: 3g
     mem_limit: 700m
@@ -34,5 +40,3 @@ services:
 
 volumes:
   graphiql:
-
-# docker-compose -f docker-compose.yml -f Resources/compose/docker-compose-prod-graphql.yml up -d

Resources/docker/app/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.7-alpine
+FROM python:3.10-alpine
 
 ENV PYTHONUNBUFFERED 1
 ENV DJANGO_SETTINGS_MODULE 'config.docker-compose'

Resources/docker/app/README.md

@@ -1,24 +1,23 @@
 # Quick reference
 
-- **Maintained by**:  
+- **Maintained by**:
     [the PokeAPI Contributors](https://github.com/PokeAPI/pokeapi/graphs/contributors)
 
-- **Where to get help**:  
+- **Where to get help**:
     [PokeAPI Slack](http://pokeapi.slack.com/).
 
-- **Where to file issues**:  
+- **Where to file issues**:
     [https://github.com/PokeAPI/pokeapi/issues](https://github.com/PokeAPI/pokeapi/issues)
 
-- **Source of this description**:  
+- **Source of this description**:
     [pokeapi repo's `Resources/docker/app/` directory](https://github.com/PokeAPI/pokeapi/blob/master/Resources/docker/app/README.md)
 
 ## Supported tags and respective `Dockerfile` links
 
-- [`latest`](https://github.com/PokeAPI/pokeapi/blob/master/Resources/docker/app/Dockerfile)
 - [`master`](https://github.com/PokeAPI/pokeapi/blob/master/Resources/docker/app/Dockerfile)
 - [`staging`](https://github.com/PokeAPI/pokeapi/blob/staging/Resources/docker/app/Dockerfile)
 
-> `pokeapi` uses `python:3.7-alpine` as base image.
+> `pokeapi` uses `python:3.10-alpine` as base image.
 
 ## What is PokeAPI?
 

Resources/k8s/kustomize/base/deployments/graphql-deployment.yaml

@@ -25,7 +25,7 @@ spec:
               done;
       containers:
         - name: graphql-engine
-          image: hasura/graphql-engine:v2.0.0-alpha.5
+          image: hasura/graphql-engine:v2.16.1
           ports:
             - containerPort: 8080
           env:

Resources/k8s/kustomize/base/deployments/haproxy-ingress-controller.yaml

@@ -16,7 +16,7 @@ spec:
       serviceAccountName: ingress-controller
       containers:
         - name: haproxy-ingress-controller
-          image: quay.io/jcmoraisjr/haproxy-ingress:v0.12.3
+          image: quay.io/jcmoraisjr/haproxy-ingress:v0.14.0
           resources:
             limits:
               memory: "256Mi"

Resources/k8s/kustomize/base/deployments/pokeapi-deployment.yaml

@@ -16,7 +16,7 @@ spec:
     spec:
       initContainers:
         - name: postgres-connection-checker
-          image: postgres:13.3-alpine
+          image: postgres:15.1-alpine
           command: ['sh', '-c']
           args:
             - until pg_isready -h postgresql -p 5432; do
@@ -26,6 +26,7 @@ spec:
       containers:
         - name: pokeapi
           image: pokeapi/pokeapi:master
+          imagePullPolicy: Always
           ports:
             - containerPort: 8080
           securityContext:  # CI: Github Actions kills this container if not run with root. Otherwise, it's safe to use the default pokeapi/pokeapi user and remove these lines.

Resources/k8s/kustomize/base/deployments/postgres-deployment.yaml

@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
         - name: postgresql
-          image: postgres:13.3-alpine
+          image: postgres:15.1-alpine
           ports:
             - containerPort: 5432
           env:

Resources/k8s/kustomize/base/deployments/redis-deployment.yaml

@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
         - name: redis
-          image: redis:6.2.3-alpine
+          image: redis:7.0.7-alpine
           ports:
             - containerPort: 6379
           resources: {}

data/v2/csv/location_area_prose.csv

@@ -103,10 +103,10 @@ location_area_id,local_language_id,name
 141,9,Road 201
 142,9,Road 202
 143,9,Road 203
-144,9,Road 204 (south, towards Jubilife City)
-145,9,Road 204 (north, towards Floaroma Town)
-146,9,Road 205 (south, towards Floaroma Town)
-147,9,Road 205 (east, towards Eterna City)
+144,9,"Road 204 (south, towards Jubilife City)"
+145,9,"Road 204 (north, towards Floaroma Town)"
+146,9,"Road 205 (south, towards Floaroma Town)"
+147,9,"Road 205 (east, towards Eterna City)"
 148,9,Road 206
 149,9,Road 207
 150,9,Road 208
@@ -116,12 +116,12 @@ location_area_id,local_language_id,name
 154,9,Lost Tower (3F)
 155,9,Lost Tower (4F)
 156,9,Lost Tower (5F)
-157,9,Road 210 (south, towards Solaceon Town)
-158,9,Road 210 (west, towards Celestic Town)
-159,9,Road 211 (west, towards Eterna City)
-160,9,Road 211 (east, towards Celestic Town)
-161,9,Road 212 (north, towards Hearthome City)
-162,9,Road 212 (east, towards Pastoria City)
+157,9,"Road 210 (south, towards Solaceon Town)"
+158,9,"Road 210 (west, towards Celestic Town)"
+159,9,"Road 211 (west, towards Eterna City)"
+160,9,"Road 211 (east, towards Celestic Town)"
+161,9,"Road 212 (north, towards Hearthome City)"
+162,9,"Road 212 (east, towards Pastoria City)"
 163,9,Road 213
 164,9,Road 214
 165,9,Road 215
@@ -251,7 +251,7 @@ location_area_id,local_language_id,name
 293,9,Rock Tunnel (B1F)
 294,9,Victory Road 1 (1F)
 295,9,Road 1
-296,9,Road 2 (south, towards Viridian City)
+296,9,"Road 2 (south, towards Viridian City)"
 297,9,Road 3
 298,9,Road 4
 299,9,Road 5
@@ -275,7 +275,7 @@ location_area_id,local_language_id,name
 317,9,Digletts Cave
 318,9,Victory Road 1 (2F)
 319,9,Victory Road 1 (3F)
-320,9,Road 2 (north, towards Pewter City)
+320,9,"Road 2 (north, towards Pewter City)"
 321,9,Viridian Forest
 323,9,Cerulean Cave (1F)
 324,9,Cerulean Cave (2F)
@@ -300,9 +300,9 @@ location_area_id,local_language_id,name
 343,9,Pokemon Mansion (3F)
 344,9,Pokemon Mansion (B1F)
 345,9,Safari Zone (middle)
-346,9,Safari Zone (Area 1, east)
-347,9,Safari Zone (Area 2, north)
-348,9,Safari Zone (Area 3, west)
+346,9,"Safari Zone (Area 1, east)"
+347,9,"Safari Zone (Area 2, north)"
+348,9,"Safari Zone (Area 3, west)"
 349,9,S.S. Anne dock
 350,9,Petalburg City
 351,9,Slateport City
@@ -318,7 +318,7 @@ location_area_id,local_language_id,name
 361,9,Granite Cave (1F)
 362,9,Granite Cave (B1F)
 363,9,Granite Cave (B2F)
-364,9,Granite Cave (1F/small Room)
+364,9,Granite Cave (1F/small room)
 365,9,Petalburg Woods
 366,9,Jagged Pass
 367,9,Fiery Path
@@ -415,7 +415,7 @@ location_area_id,local_language_id,name
 488,9,Mount Ember
 489,9,Mount Ember (cave)
 490,9,Mount Ember (inside)
-491,9,Mount Ember (1F, cave behind team rocket)
+491,9,"Mount Ember (1F, cave behind team rocket)"
 492,9,Mount Ember (B1F)
 493,9,Mount Ember (B2F)
 494,9,Mount Ember (B3F)

data/v2/csv/pokemon_species.csv

@@ -904,106 +904,106 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
 903,sneasler,8,215,109,4,6,,4,135,,0,,0,4,0,0,0,903,
 904,overqwil,8,211,106,1,3,,4,135,,0,,0,2,0,0,0,904,
 905,enamorus,8,,477,6,4,,8,3,,0,,0,1,1,1,0,905,
-906,sprigatito,9,,,5,,,,45,50,0,20,0,,0,0,0,906,
-907,floragato,9,906,,5,,,,45,50,0,20,0,,0,0,0,907,
-908,meowscarada,9,907,,5,,,,45,50,0,20,0,,0,0,0,908,
-909,fuecoco,9,,,8,,,,45,50,0,20,0,,0,0,0,909,
-910,crocalor,9,909,,8,,,,45,50,0,20,0,,0,0,0,910,
-911,skeledirge,9,910,,8,,,,45,50,0,20,0,,0,0,0,911,
-912,quaxly,9,,,9,,,,45,50,0,20,0,,0,0,0,912,
-913,quaxwell,9,912,,2,,,,45,50,0,20,0,,0,0,0,913,
-914,quaquaval,9,913,,2,,,,45,50,0,20,0,,0,0,0,914,
-915,lechonk,9,,,4,,,,255,50,0,15,0,,0,0,0,915,
-916,oinkologne,9,915,,4,,,,100,50,0,15,0,,0,0,0,916,
-917,dudunsparce,9,206,,10,,,,45,50,0,20,0,,0,0,0,917,
-918,tarountula,9,,,9,,,,255,50,0,15,0,,0,0,0,918,
-919,spidops,9,918,,5,,,,120,50,0,15,0,,0,0,0,919,
-920,nymble,9,,,4,,,,190,20,0,20,0,,0,0,0,920,
-921,lokix,9,920,,4,,,,30,0,0,20,0,,0,0,0,921,
-922,rellor,9,,,3,,,,190,50,0,20,0,,0,0,0,922,
-923,rabsca,9,922,,5,,,,45,50,0,20,0,,0,0,0,923,
-924,greavard,9,,,9,,,,120,50,0,20,0,,0,0,0,924,
-925,houndstone,9,924,,9,,,,60,50,0,20,0,,0,0,0,925,
-926,flittle,9,,,10,,,,120,50,0,20,0,,0,0,0,926,
-927,espathra,9,926,,10,,,,60,50,0,20,0,,0,0,0,927,
-928,farigiraf,9,203,,3,,,,45,50,0,20,0,,0,0,0,928,
-929,wiglett,9,,,9,,,,255,50,0,20,0,,0,0,0,929,
-930,wugtrio,9,929,,8,,,,50,50,0,20,0,,0,0,0,930,
-931,dondozo,9,,,2,,,,25,50,0,40,0,,0,0,0,931,
-932,veluza,9,,,4,,,,100,50,0,20,0,,0,0,0,932,
-933,finizen,9,,,2,,,,200,50,0,40,0,,0,0,0,933,
-934,palafin,9,933,,2,,,,45,50,0,40,0,,0,0,0,934,
-935,smoliv,9,,,5,,,,255,50,0,20,0,,0,0,0,935,
-936,dolliv,9,935,,5,,,,120,50,0,20,0,,0,0,0,936,
-937,arboliva,9,936,,5,,,,45,50,0,20,0,,0,0,0,937,
-938,capsakid,9,,,5,,,,190,50,0,20,0,,0,0,0,938,
-939,scovillain,9,938,,5,,,,75,50,0,20,0,,0,0,0,939,
-940,tadbulb,9,,,10,,,,190,50,0,20,0,,0,0,0,940,
-941,bellibolt,9,940,,5,,,,50,50,0,20,0,,0,0,0,941,
-942,varoom,9,,,4,,,,190,50,0,20,0,,0,0,0,942,
-943,revavroom,9,942,,4,,,,75,50,0,20,0,,0,0,0,943,
-944,orthworm,9,,,6,,,,25,50,0,35,0,,0,0,0,944,
-945,tandemaus,9,,,9,,,,150,50,0,10,0,,0,0,0,945,
-946,maushold,9,945,,9,,,,75,50,0,10,0,,0,0,0,946,
-947,cetoddle,9,,,9,,,,150,50,0,25,0,,0,0,0,947,
-948,cetitan,9,947,,9,,,,50,50,0,25,0,,0,0,0,948,
-949,frigibax,9,,,4,,,,45,50,0,40,0,,0,0,0,949,
-950,arctibax,9,949,,4,,,,25,50,0,40,0,,0,0,0,950,
-951,baxcalibur,9,950,,4,,,,10,50,0,40,0,,0,0,0,951,
-952,tatsugiri,9,,,6,,,,100,50,0,35,0,,0,0,0,952,
-953,cyclizar,9,,,5,,,,190,50,0,30,0,,0,0,0,953,
-954,pawmi,9,,,10,,,,190,50,0,15,0,,0,0,0,954,
-955,pawmo,9,954,,10,,,,80,50,0,15,0,,0,0,0,955,
-956,pawmot,9,955,,10,,,,45,50,0,15,0,,0,0,0,956,
-957,wattrel,9,,,1,,,,180,50,0,20,0,,0,0,0,957,
-958,kilowattrel,9,957,,10,,,,90,50,0,20,0,,0,0,0,958,
-959,bombirdier,9,,,9,,,,25,50,0,35,0,,0,0,0,959,
-960,squawkabilly,9,,,5,,,,190,50,0,15,0,,0,0,0,960,
-961,flamigo,9,,,6,,,,100,50,0,20,0,,0,0,0,961,
-962,klawf,9,,,8,,,,120,50,0,35,0,,0,0,0,962,
-963,nacli,9,,,3,,,,255,50,0,20,0,,0,0,0,963,
-964,naclstack,9,963,,3,,,,120,50,0,20,0,,0,0,0,964,
-965,garganacl,9,964,,3,,,,45,50,0,20,0,,0,0,0,965,
-966,glimmet,9,,,2,,,,70,50,0,30,0,,0,0,0,966,
-967,glimmora,9,966,,2,,,,25,50,0,30,0,,0,0,0,967,
-968,shroodle,9,,,4,,,,190,50,0,20,0,,0,0,0,968,
-969,grafaiai,9,968,,4,,,,90,50,0,20,0,,0,0,0,969,
-970,fidough,9,,,10,,,,190,50,0,20,0,,0,0,0,970,
-971,dachsbun,9,970,,3,,,,90,50,0,20,0,,0,0,0,971,
-972,maschiff,9,,,3,,,,150,50,0,20,0,,0,0,0,972,
-973,mabosstiff,9,972,,4,,,,75,50,0,20,0,,0,0,0,973,
-974,bramblin,9,,,3,,,,190,50,0,20,0,,0,0,0,974,
-975,brambleghast,9,974,,3,,,,45,50,0,20,0,,0,0,0,975,
-976,gimmighoul,9,,,3,,,,45,50,0,50,0,,0,0,0,976,
-977,gholdengo,9,976,,10,,,,45,50,0,50,0,,0,0,0,977,
-978,great-tusk,9,,,7,,,,30,0,0,50,0,,0,0,0,978,
-979,brute-bonnet,9,,,4,,,,50,0,0,50,0,,0,0,0,979,
-981,sandy-shocks,9,,,4,,,,30,0,0,50,0,,0,0,0,981,
-982,scream-tail,9,,,6,,,,50,0,0,50,0,,0,0,0,982,
-983,flutter-mane,9,,,4,,,,30,0,0,50,0,,0,0,0,983,
-984,slither-wing,9,,,8,,,,30,0,0,50,0,,0,0,0,984,
-985,roaring-moon,9,,,5,,,,10,0,0,50,0,,0,0,0,985,
-986,iron-treads,9,,,4,,,,30,0,0,50,0,,0,0,0,986,
-988,iron-moth,9,,,10,,,,30,0,0,50,0,,0,0,0,988,
-989,iron-hands,9,,,4,,,,50,0,0,50,0,,0,0,0,989,
-990,iron-jugulis,9,,,2,,,,30,0,0,50,0,,0,0,0,990,
-991,iron-thorns,9,,,5,,,,30,0,0,50,0,,0,0,0,991,
-992,iron-bundle,9,,,8,,,,50,0,0,50,0,,0,0,0,992,
-993,iron-valiant,9,,,9,,,,10,0,0,50,0,,0,0,0,993,
-994,ting-lu,9,,,3,,,,6,0,0,50,0,,0,0,0,994,
-995,chien-pao,9,,,9,,,,6,0,0,50,0,,0,0,0,995,
-996,wo-chien,9,,,3,,,,6,0,0,50,0,,0,0,0,996,
-997,chi-yu,9,,,8,,,,6,0,0,50,0,,0,0,0,997,
-998,koraidon,9,,,8,,,,3,0,0,50,0,,0,0,0,998,
-999,miraidon,9,,,2,,,,3,0,0,50,0,,0,0,0,999,
-1000,tinkatink,9,,,6,,,,190,50,0,20,0,,0,0,0,1000,
-1001,tinkatuff,9,1000,,6,,,,90,50,0,20,0,,0,0,0,1001,
-1002,tinkaton,9,1001,,6,,,,45,50,0,20,0,,0,0,0,1002,
-1003,charcadet,9,,,8,,,,90,50,0,35,0,,0,0,0,1003,
-1004,armarouge,9,1003,,8,,,,25,20,0,35,0,,0,0,0,1004,
-1005,ceruledge,9,1003,,2,,,,25,20,0,35,0,,0,0,0,1005,
-1006,toedscool,9,,,10,,,,190,50,0,20,0,,0,0,0,1006,
-1007,toedscruel,9,1006,,1,,,,90,50,0,20,0,,0,0,0,1007,
-1008,kingambit,9,625,,1,,,,25,50,0,20,0,,0,0,0,1008,
-1009,clodsire,9,194,,3,,,,90,50,0,20,0,,0,0,0,1009,
-1010,annihilape,9,57,,4,,,,45,50,0,20,0,,0,0,0,1010,
+906,sprigatito,9,,,5,,,1,45,50,0,20,0,,0,0,0,906,
+907,floragato,9,906,,5,,,1,45,50,0,20,0,,0,0,0,907,
+908,meowscarada,9,907,,5,,,1,45,50,0,20,0,,0,0,0,908,
+909,fuecoco,9,,,8,,,1,45,50,0,20,0,,0,0,0,909,
+910,crocalor,9,909,,8,,,1,45,50,0,20,0,,0,0,0,910,
+911,skeledirge,9,910,,8,,,1,45,50,0,20,0,,0,0,0,911,
+912,quaxly,9,,,9,,,1,45,50,0,20,0,,0,0,0,912,
+913,quaxwell,9,912,,2,,,1,45,50,0,20,0,,0,0,0,913,
+914,quaquaval,9,913,,2,,,1,45,50,0,20,0,,0,0,0,914,
+915,lechonk,9,,,4,,,4,255,50,0,15,0,,0,0,0,915,
+916,oinkologne,9,915,,4,,,0,100,50,0,15,0,,0,0,0,916,
+917,dudunsparce,9,206,,10,,,4,45,50,0,20,0,,0,0,0,917,
+918,tarountula,9,,,9,,,4,255,50,0,15,0,,0,0,0,918,
+919,spidops,9,918,,5,,,4,120,50,0,15,0,,0,0,0,919,
+920,nymble,9,,,4,,,4,190,20,0,20,0,,0,0,0,920,
+921,lokix,9,920,,4,,,4,30,0,0,20,0,,0,0,0,921,
+922,rellor,9,,,3,,,4,190,50,0,20,0,,0,0,0,922,
+923,rabsca,9,922,,5,,,4,45,50,0,20,0,,0,0,0,923,
+924,greavard,9,,,9,,,4,120,50,0,20,0,,0,0,0,924,
+925,houndstone,9,924,,9,,,4,60,50,0,20,0,,0,0,0,925,
+926,flittle,9,,,10,,,4,120,50,0,20,0,,0,0,0,926,
+927,espathra,9,926,,10,,,4,60,50,0,20,0,,0,0,0,927,
+928,farigiraf,9,203,,3,,,4,45,50,0,20,0,,0,0,0,928,
+929,wiglett,9,,,9,,,4,255,50,0,20,0,,0,0,0,929,
+930,wugtrio,9,929,,8,,,4,50,50,0,20,0,,0,0,0,930,
+931,dondozo,9,,,2,,,4,25,50,0,40,0,,0,0,0,931,
+932,veluza,9,,,4,,,4,100,50,0,20,0,,0,0,0,932,
+933,finizen,9,,,2,,,4,200,50,0,40,0,,0,0,0,933,
+934,palafin,9,933,,2,,,4,45,50,0,40,0,,0,0,0,934,
+935,smoliv,9,,,5,,,4,255,50,0,20,0,,0,0,0,935,
+936,dolliv,9,935,,5,,,4,120,50,0,20,0,,0,0,0,936,
+937,arboliva,9,936,,5,,,4,45,50,0,20,0,,0,0,0,937,
+938,capsakid,9,,,5,,,4,190,50,0,20,0,,0,0,0,938,
+939,scovillain,9,938,,5,,,4,75,50,0,20,0,,0,0,0,939,
+940,tadbulb,9,,,10,,,4,190,50,0,20,0,,0,0,0,940,
+941,bellibolt,9,940,,5,,,4,50,50,0,20,0,,0,0,0,941,
+942,varoom,9,,,4,,,4,190,50,0,20,0,,0,0,0,942,
+943,revavroom,9,942,,4,,,4,75,50,0,20,0,,0,0,0,943,
+944,orthworm,9,,,6,,,4,25,50,0,35,0,,0,0,0,944,
+945,tandemaus,9,,,9,,,-1,150,50,0,10,0,,0,0,0,945,
+946,maushold,9,945,,9,,,-1,75,50,0,10,0,,0,0,0,946,
+947,cetoddle,9,,,9,,,4,150,50,0,25,0,,0,0,0,947,
+948,cetitan,9,947,,9,,,4,50,50,0,25,0,,0,0,0,948,
+949,frigibax,9,,,4,,,4,45,50,0,40,0,,0,0,0,949,
+950,arctibax,9,949,,4,,,4,25,50,0,40,0,,0,0,0,950,
+951,baxcalibur,9,950,,4,,,4,10,50,0,40,0,,0,0,0,951,
+952,tatsugiri,9,,,6,,,4,100,50,0,35,0,,0,0,0,952,
+953,cyclizar,9,,,5,,,4,190,50,0,30,0,,0,0,0,953,
+954,pawmi,9,,,10,,,4,190,50,0,15,0,,0,0,0,954,
+955,pawmo,9,954,,10,,,4,80,50,0,15,0,,0,0,0,955,
+956,pawmot,9,955,,10,,,4,45,50,0,15,0,,0,0,0,956,
+957,wattrel,9,,,1,,,4,180,50,0,20,0,,0,0,0,957,
+958,kilowattrel,9,957,,10,,,4,90,50,0,20,0,,0,0,0,958,
+959,bombirdier,9,,,9,,,4,25,50,0,35,0,,0,0,0,959,
+960,squawkabilly,9,,,5,,,4,190,50,0,15,0,,0,0,0,960,
+961,flamigo,9,,,6,,,4,100,50,0,20,0,,0,0,0,961,
+962,klawf,9,,,8,,,4,120,50,0,35,0,,0,0,0,962,
+963,nacli,9,,,3,,,4,255,50,0,20,0,,0,0,0,963,
+964,naclstack,9,963,,3,,,4,120,50,0,20,0,,0,0,0,964,
+965,garganacl,9,964,,3,,,4,45,50,0,20,0,,0,0,0,965,
+966,glimmet,9,,,2,,,4,70,50,0,30,0,,0,0,0,966,
+967,glimmora,9,966,,2,,,4,25,50,0,30,0,,0,0,0,967,
+968,shroodle,9,,,4,,,4,190,50,0,20,0,,0,0,0,968,
+969,grafaiai,9,968,,4,,,4,90,50,0,20,0,,0,0,0,969,
+970,fidough,9,,,10,,,4,190,50,0,20,0,,0,0,0,970,
+971,dachsbun,9,970,,3,,,4,90,50,0,20,0,,0,0,0,971,
+972,maschiff,9,,,3,,,4,150,50,0,20,0,,0,0,0,972,
+973,mabosstiff,9,972,,4,,,4,75,50,0,20,0,,0,0,0,973,
+974,bramblin,9,,,3,,,4,190,50,0,20,0,,0,0,0,974,
+975,brambleghast,9,974,,3,,,4,45,50,0,20,0,,0,0,0,975,
+976,gimmighoul,9,,,3,,,-1,45,50,0,50,0,,0,0,0,976,
+977,gholdengo,9,976,,10,,,-1,45,50,0,50,0,,0,0,0,977,
+978,great-tusk,9,,,7,,,-1,30,0,0,50,0,,0,0,0,978,
+979,brute-bonnet,9,,,4,,,-1,50,0,0,50,0,,0,0,0,979,
+981,sandy-shocks,9,,,4,,,-1,30,0,0,50,0,,0,0,0,981,
+982,scream-tail,9,,,6,,,-1,50,0,0,50,0,,0,0,0,982,
+983,flutter-mane,9,,,4,,,-1,30,0,0,50,0,,0,0,0,983,
+984,slither-wing,9,,,8,,,-1,30,0,0,50,0,,0,0,0,984,
+985,roaring-moon,9,,,5,,,-1,10,0,0,50,0,,0,0,0,985,
+986,iron-treads,9,,,4,,,-1,30,0,0,50,0,,0,0,0,986,
+988,iron-moth,9,,,10,,,-1,30,0,0,50,0,,0,0,0,988,
+989,iron-hands,9,,,4,,,-1,50,0,0,50,0,,0,0,0,989,
+990,iron-jugulis,9,,,2,,,-1,30,0,0,50,0,,0,0,0,990,
+991,iron-thorns,9,,,5,,,-1,30,0,0,50,0,,0,0,0,991,
+992,iron-bundle,9,,,8,,,-1,50,0,0,50,0,,0,0,0,992,
+993,iron-valiant,9,,,9,,,-1,10,0,0,50,0,,0,0,0,993,
+994,ting-lu,9,,,3,,,-1,6,0,0,50,0,,0,0,0,994,
+995,chien-pao,9,,,9,,,-1,6,0,0,50,0,,0,0,0,995,
+996,wo-chien,9,,,3,,,-1,6,0,0,50,0,,0,0,0,996,
+997,chi-yu,9,,,8,,,-1,6,0,0,50,0,,0,0,0,997,
+998,koraidon,9,,,8,,,-1,3,0,0,50,0,,0,0,0,998,
+999,miraidon,9,,,2,,,-1,3,0,0,50,0,,0,0,0,999,
+1000,tinkatink,9,,,6,,,8,190,50,0,20,0,,0,0,0,1000,
+1001,tinkatuff,9,1000,,6,,,8,90,50,0,20,0,,0,0,0,1001,
+1002,tinkaton,9,1001,,6,,,8,45,50,0,20,0,,0,0,0,1002,
+1003,charcadet,9,,,8,,,4,90,50,0,35,0,,0,0,0,1003,
+1004,armarouge,9,1003,,8,,,4,25,20,0,35,0,,0,0,0,1004,
+1005,ceruledge,9,1003,,2,,,4,25,20,0,35,0,,0,0,0,1005,
+1006,toedscool,9,,,10,,,4,190,50,0,20,0,,0,0,0,1006,
+1007,toedscruel,9,1006,,1,,,4,90,50,0,20,0,,0,0,0,1007,
+1008,kingambit,9,625,,1,,,4,25,50,0,20,0,,0,0,0,1008,
+1009,clodsire,9,194,,3,,,4,90,50,0,20,0,,0,0,0,1009,
+1010,annihilape,9,57,,4,,,4,45,50,0,20,0,,0,0,0,1010,

docker-compose.yml

@@ -1,13 +1,13 @@
 version: '2.4'
 services:
   cache:
-    image: redis:alpine
+    image: redis:7.0.7-alpine
     volumes:
       - redis_data:/data
     restart: always
 
   db:
-    image: postgres
+    image: postgres:15.1
     environment:
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-pokemon}
       POSTGRES_USER: ${POSTGRES_USER:-ash}
@@ -33,7 +33,7 @@ services:
     restart: always
 
   web:
-    image: nginx:alpine
+    image: nginx:1.23.3-alpine
     ports:
       - "80:80"
       - "443:443"
@@ -44,7 +44,7 @@ services:
       - ./Resources/nginx/ssl:/ssl:ro
       - graphql_cache:/tmp/cache
   graphql-engine:
-    image: hasura/graphql-engine:v2.0.8
+    image: hasura/graphql-engine:v2.16.1
     ports:
       - "8080:8080"
     depends_on: