mirror of
https://github.com/PokeAPI/pokeapi
synced 2025-02-16 12:38:25 +00:00
chore: split compose files/rename ssl conf
This commit is contained in:
parent
655ff4f955
commit
4f127e4110
4 changed files with 14 additions and 7 deletions
|
@ -4,7 +4,7 @@ services:
|
||||||
environment:
|
environment:
|
||||||
POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}"
|
POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}"
|
||||||
POSTGRES_USER: "${POSTGRES_USER}"
|
POSTGRES_USER: "${POSTGRES_USER}"
|
||||||
|
|
||||||
app:
|
app:
|
||||||
env_file: .env
|
env_file: .env
|
||||||
|
|
||||||
|
@ -22,10 +22,10 @@ services:
|
||||||
command: sh -c 'cp -a /app/static/. /transfer/ && tail -f /etc/passwd'
|
command: sh -c 'cp -a /app/static/. /transfer/ && tail -f /etc/passwd'
|
||||||
volumes:
|
volumes:
|
||||||
- graphiql:/transfer
|
- graphiql:/transfer
|
||||||
depends_on:
|
depends_on:
|
||||||
- graphql-engine
|
- graphql-engine
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
graphiql:
|
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
|
||||||
|
|
9
docker-compose-dev.yml
Normal file
9
docker-compose-dev.yml
Normal file
|
@ -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
|
|
@ -17,9 +17,7 @@ services:
|
||||||
restart: always
|
restart: always
|
||||||
|
|
||||||
app:
|
app:
|
||||||
build:
|
image: pokeapi/pokeapi:master
|
||||||
context: .
|
|
||||||
dockerfile: ./Resources/docker/app/Dockerfile
|
|
||||||
user: ${RUN_AS:-pokeapi}
|
user: ${RUN_AS:-pokeapi}
|
||||||
environment:
|
environment:
|
||||||
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-pokemon}
|
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-pokemon}
|
||||||
|
|
Loading…
Add table
Reference in a new issue