Chapril/mobilizon.chapril.org-mobilizon
Chapril/mobilizon.chapril.org-mobilizon
26
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch '255-fix-make-error' into 'master'

Browse Source 
Fix error when running `make` / `docker-compose up`

Closes #255

See merge request framasoft/mobilizon!292
This commit is contained in:
Thomas Citharel 2019-10-23 15:05:28 +02:00
commit 221d10cd85
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -5,11 +5,6 @@ init:
start: stop start: stop
@bash docker/message.sh "starting Mobilizon with docker" @bash docker/message.sh "starting Mobilizon with docker"
docker-compose up -d api 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" @bash docker/message.sh "started"
stop: stop:
@bash docker/message.sh "stopping Mobilizon" @bash docker/message.sh "stopping Mobilizon"

10
docker-compose.yml
View File

@ -30,7 +30,15 @@ services:
MOBILIZON_DATABASE_USERNAME: postgres MOBILIZON_DATABASE_USERNAME: postgres
MOBILIZON_DATABASE_DBNAME: mobilizon_dev MOBILIZON_DATABASE_DBNAME: mobilizon_dev
MOBILIZON_DATABASE_HOST: postgres 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: volumes:
pgdata: pgdata:
.: .: