From 7b23ca69653cd4ae5e68bf9a479ff7e44739dcbe Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Wed, 16 Oct 2019 11:12:42 +0200 Subject: [PATCH] Improve docker setup Signed-off-by: Thomas Citharel --- Dockerfile | 2 +- Makefile | 7 ++++++- docker-compose.yml | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index a37e586dc..c90b043b0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,4 +7,4 @@ RUN mix local.hex --force && mix local.rebar --force WORKDIR /app -EXPOSE 4000 4001 4002 +EXPOSE 4000 diff --git a/Makefile b/Makefile index b874b19b4..f4e610f77 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,12 @@ init: start: stop @bash docker/message.sh "starting Mobilizon with docker" - docker-compose up -d + 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 c6904c86b..99e57ea55 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -30,7 +30,7 @@ services: MOBILIZON_DATABASE_USERNAME: postgres MOBILIZON_DATABASE_DBNAME: mobilizon_dev MOBILIZON_DATABASE_HOST: postgres - command: "mix phx.deps_migrate_serve" + command: "mix phx.server" volumes: pgdata: .: