diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index 0e276363..77e0dc5e 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -6,4 +6,4 @@ services: context: . dockerfile: ./Resources/docker/app/Dockerfile -# # docker-compose -f docker-compose.yml -f Resources/compose/docker-compose-dev.yml up -d +# docker-compose -f docker-compose.yml -f docker-compose-dev.yml up -d diff --git a/docker-compose.override.yml b/docker-compose.override.yml new file mode 100644 index 00000000..68d081e1 --- /dev/null +++ b/docker-compose.override.yml @@ -0,0 +1,5 @@ +version: '2.4' + +services: + app: + image: pokeapi/pokeapi:master diff --git a/docker-compose.yml b/docker-compose.yml index 0629182d..2c9a0877 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,7 +17,6 @@ services: restart: always app: - image: pokeapi/pokeapi:master user: ${RUN_AS:-pokeapi} environment: POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-pokemon}