diff --git a/Makefile b/Makefile index f4e610f77..7f7cda3c9 100644 --- a/Makefile +++ b/Makefile @@ -5,11 +5,6 @@ init: start: stop @bash docker/message.sh "starting Mobilizon with docker" docker-compose up -d api - docker-compose exec api sh -c "cd js && yarn install && cd ../" - docker-compose exec api mix deps.get - docker-compose exec api mix compile - docker-compose exec api mix ecto.create - docker-compose exec api mix ecto.migrate @bash docker/message.sh "started" stop: @bash docker/message.sh "stopping Mobilizon" diff --git a/docker-compose.yml b/docker-compose.yml index 99e57ea55..caa767380 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -30,7 +30,15 @@ services: MOBILIZON_DATABASE_USERNAME: postgres MOBILIZON_DATABASE_DBNAME: mobilizon_dev MOBILIZON_DATABASE_HOST: postgres - command: "mix phx.server" + command: > + sh -c "cd js && + yarn install && + cd ../ && + mix deps.get && + mix compile && + mix ecto.create && + mix ecto.migrate && + mix phx.server" volumes: pgdata: .: