Merge branch 'docker/improve-script' into 'master'

Docker/improve script

See merge request framasoft/mobilizon!275

Dockerfile

@@ -7,4 +7,4 @@ RUN mix local.hex --force && mix local.rebar --force
 
 WORKDIR /app
 
-EXPOSE 4000 4001 4002
+EXPOSE 4000

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"

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:
   .:

support/guides/development/development.md

@@ -39,4 +39,4 @@ Just run :
 ```bash
 make start
 ```
-to build and launch a database container and an API container running on localhost.
+to build and launch a database container and an API container running on `localhost:4000`.

support/guides/development/tests.md

@@ -9,6 +9,8 @@ To launch all the tests:
 mix test
 ```
 
+> If you're using Docker, you can use `make test`
+
 If you want test coverage:
 
 ```bash
@@ -41,6 +43,11 @@ Not done yet.
 
 We use [Cypress](https://cypress.io) for End-to-end testing.
 
+You first need to run the webserver with the `e2e` environment: `MIX_ENV=e2e mix phx.server`. The same environment parameters as the `dev` environment must be provided.
+This allows to run database operations in the sandbox and not pollute your database.
+
+Then, run `MIX_ENV=e2e mix run priv/repo/e2e.seed.exs` to have some initial data inside your instance for the tests.
+
 When inside the `js` directory, you can do either
 ```bash
 npx cypress run