Mirrors/pokeapi
2
0
Fork 0
mirror of https://github.com/PokeAPI/pokeapi synced 2025-02-16 12:38:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

feat: read env when creating containers

Browse source
This commit is contained in:
Alessandro Pezzè 2021-05-14 19:48:14 +02:00
parent 234b612904
commit d8b867355e
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Resources/compose/docker-compose-prod-graphql.yml
View file

@ -14,7 +14,7 @@ services:
graphql-engine: graphql-engine:
environment: environment:
HASURA_GRAPHQL_DATABASE_URL: "postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db:5432/pokeapi" HASURA_GRAPHQL_DATABASE_URL: "postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db:5432/${POSTGRES_DB:-pokeapi}"
HASURA_GRAPHQL_ADMIN_SECRET: "${HASURA_GRAPHQL_ADMIN_SECRET}" HASURA_GRAPHQL_ADMIN_SECRET: "${HASURA_GRAPHQL_ADMIN_SECRET}"
graphiql: graphiql:

2
config/docker-compose.py
View file

@ -5,7 +5,7 @@ from .settings import *
DATABASES = { DATABASES = {
"default": { "default": {
"ENGINE": "django.db.backends.postgresql_psycopg2", "ENGINE": "django.db.backends.postgresql_psycopg2",
"NAME": "pokeapi", "NAME": os.environ.get("POSTGRES_DB", "pokeapi"),
"USER": os.environ.get("POSTGRES_USER", "ash"), "USER": os.environ.get("POSTGRES_USER", "ash"),
"PASSWORD": os.environ.get("POSTGRES_PASSWORD", "pokemon"), "PASSWORD": os.environ.get("POSTGRES_PASSWORD", "pokemon"),
"HOST": "db", "HOST": "db",

14
docker-compose.yml
View file

@ -9,9 +9,9 @@ services:
db: db:
image: postgres image: postgres
environment: environment:
POSTGRES_PASSWORD: 'pokemon' POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-pokemon}
POSTGRES_USER: 'ash' POSTGRES_USER: ${POSTGRES_USER:-ash}
POSTGRES_DB: 'pokeapi' POSTGRES_DB: ${POSTGRES_DB:-pokeapi}
volumes: volumes:
- pg_data:/var/lib/postgresql/data - pg_data:/var/lib/postgresql/data
restart: always restart: always
@ -20,6 +20,10 @@ services:
build: build:
context: . context: .
dockerfile: ./Resources/docker/app/Dockerfile dockerfile: ./Resources/docker/app/Dockerfile
environment:
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-pokemon}
POSTGRES_USER: ${POSTGRES_USER:-ash}
POSTGRES_DB: ${POSTGRES_DB:-pokeapi}
volumes: volumes:
- .:/code - .:/code
links: links:
@ -53,11 +57,11 @@ services:
- "db" - "db"
restart: always restart: always
environment: environment:
HASURA_GRAPHQL_DATABASE_URL: postgres://ash:pokemon@db:5432/pokeapi HASURA_GRAPHQL_DATABASE_URL: postgres://${POSTGRES_USER:-ash}:${POSTGRES_PASSWORD:-pokemon}@db:5432/${POSTGRES_DB:-pokeapi}
HASURA_GRAPHQL_ENABLE_CONSOLE: "true" HASURA_GRAPHQL_ENABLE_CONSOLE: "true"
HASURA_GRAPHQL_DEV_MODE: "false" HASURA_GRAPHQL_DEV_MODE: "false"
HASURA_GRAPHQL_ENABLED_LOG_TYPES: startup, http-log, webhook-log, websocket-log, query-log HASURA_GRAPHQL_ENABLED_LOG_TYPES: startup, http-log, webhook-log, websocket-log, query-log
HASURA_GRAPHQL_ADMIN_SECRET: pokemon HASURA_GRAPHQL_ADMIN_SECRET: ${HASURA_GRAPHQL_ADMIN_SECRET:-pokemon}
HASURA_GRAPHQL_UNAUTHORIZED_ROLE: anon HASURA_GRAPHQL_UNAUTHORIZED_ROLE: anon
HASURA_GRAPHQL_ENABLE_TELEMETRY: "false" HASURA_GRAPHQL_ENABLE_TELEMETRY: "false"
# HASURA_GRAPHQL_CONSOLE_ASSETS_DIR: /srv/console-assets # HASURA_GRAPHQL_CONSOLE_ASSETS_DIR: /srv/console-assets