feat: update

This commit is contained in:
Alessandro Pezzè 2023-01-09 16:11:23 +01:00
parent 61c87de336
commit 1cbb78f27e
10 changed files with 19 additions and 14 deletions

View file

@ -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

View file

@ -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.

View file

@ -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

View file

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

View file

@ -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:

View file

@ -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"

View file

@ -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.

View file

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

View file

@ -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: {}

View file

@ -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: