mirror of
https://framagit.org/framasoft/mobilizon.git
synced 2024-12-23 00:14:48 +00:00
Merge branch '255-fix-make-error' into 'master'
Fix error when running `make` / `docker-compose up` Closes #255 See merge request framasoft/mobilizon!292
This commit is contained in:
commit
221d10cd85
2 changed files with 9 additions and 6 deletions
5
Makefile
5
Makefile
|
@ -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"
|
||||||
|
|
|
@ -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:
|
||||||
.:
|
.:
|
||||||
|
|
Loading…
Reference in a new issue