Commit 2445b11a authored by BAIRE Anthony's avatar BAIRE Anthony

quick fixes

parent 8d41da81
......@@ -9,7 +9,7 @@ A minimal deployment of allgo consists of 4 docker images:
- **allgo/rails**: the rails application server
- **allgo/mysql**: the mysql database server
- **allgo/docker**: the manager for user docker containers
- **allgo/controller**: the manager for user docker containers
- **allgo/ssh**: the ssh frontend (giving access to the sandboxes)
These images may be deployed multiple times to implement multiple independent
......@@ -66,7 +66,7 @@ The development environment is managed with docker-compose. There are 3 importan
It provides 7 containers:
- `dev-docker`
- `dev-controller`
- `dev-mysql`
- `dev-nginx`
- `dev-rails`
......@@ -83,7 +83,7 @@ docker-compose. This is managed with the `DOCKER_USER` environment variable set
by `prepare.sh`.
For convenience (again), there is an extra external volumes for `dev-rails`,
`dev-docker` and `dev-ssh` so that the source directory of the app is mounted
`dev-controller` and `dev-ssh` so that the source directory of the app is mounted
inside `/opt/` (in fact it overrides the actual application files provided by
the docker image). The purpose is to avoid rebuilding a new docker image for
each development iteration.
......@@ -100,13 +100,9 @@ To set up the development environment, run:
1. get the sources
<pre>
git clone git@gitlab.irisa.fr:charly.maupetit/rails-allgo.git -b docker
git clone git@gitlab.irisa.fr:sebastien.campion/allgo.git -b docker
git clone git@gitlab.inria.fr:allgo/allgo.git
cd allgo
</pre>
**Note:** the *allgo* repository has a symbolic link to the
*rails-allgo* repository. They should be cloned at the same place (or
the link will be broken).
2. *(as root)* create `/data/dev` and make it owned by the developer
<pre>
......@@ -187,7 +183,7 @@ https://docs.docker.com/compose/]()
- **Note:** most commands work on every container by default (eg: up down
start stop restart ...) they can be use on an individual container too:
<pre>
fig restart dev-docker dev-rails
fig restart dev-controller dev-rails
</pre>
- run a container with an arbitrary command (eg: to have access to the rails console)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment