Skip to content

Commit

Permalink
Update install documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
@FedeG
FedeG committed Mar 2, 2019
1 parent 8c09bde commit b4ce97a
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 177 deletions.
102 changes: 14 additions & 88 deletions docs/en/installation.md
View file
Original file line number Diff line number Diff line change
@@ -1,29 +1,31 @@
# Esta es la instalación para modo desarrollo
Hay dos opciones:
- Con docker (recomendada)
- Directamente en tu maquina

## Con Docker
Solo se puede instalar con docker y docker-compose

### Setup developer mode
```
cp .env.dist .env (Customize if necessary)
cp ./eventol/front/webpack.local-settings.js{.sample,}
cd deploy/docker
cp .env.dist .env
docker-compose pull
docker-compose build --force-rm
docker-compose up -d --build
```

### This creates 3 different containers
### This creates 5 different containers
```
Name Command State Ports
--------------------------------------------------------------------------------------------
eventol_reactjs_1 npm start Up 0.0.0.0:3000->3000/tcp, 8000/tcp
eventol_redis_1 docker-entrypoint.sh redis ... Up 0.0.0.0:32779->6379/tcp
eventol_worker_1 python manage.py runserver ... Up 0.0.0.0:8000->8000/tcp
docker_daphne_1 bash -c cd eventol; daphne ... Up 8000/tcp
docker_postgres_1 docker-entrypoint.sh postgres Up 0.0.0.0:32790->5432/tcp
docker_redis_1 docker-entrypoint.sh redis ... Up 0.0.0.0:32791->6379/tcp
docker_worker_1 /root/wait-for-it.sh -p 54 ... Up 8000/tcp
docker_elasticsearch_1 ... Up 9300/tcp 9200/tcp
```

### Running the django server
```
docker-compose exec worker ./deploy/scripts/install-container-dev.sh
docker-compose exec worker python eventol/manage.py migrate
docker-compose exec worker python eventol/manage.py collectstatic
docker-compose exec worker python eventol/manage.py runserver 0.0.0.0:8000
```

Expand All @@ -38,82 +40,6 @@ docker-compose exec reactjs yarn start
docker-compose logs -f [reactjs|worker|redis]
```

## Sin docker

### Npm
Nosotros estamos usando npm para las dependencias del frontend
* [Instalar npm y nodejs](https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager)

### Python 3
Nosotros estamos usando python 3.5 para correr el proyecto

### Instalar dependencias, crear la base de datos y actualizar estaticos

#### Hacerlo desde script
```bash
./deploy/scripts/install.sh
```

#### Hacerlo manualmente

##### Si usas virtualenv (si vas a instalar a mano es recomendable):
```bash
virtualenv -p python3 venv
source venv/bin/activate
```

##### Instalar dependencias de python
```bash
pip install -r requirements.txt -r requirements-dev.txt
```

##### Crear la base de datos y cargar datos de ejemplo
```bash
cd eventol
./manage.py migrate
./manage.py loaddata manager/initial_data/initial_data.json
./manage.py loaddata manager/initial_data/security.json
./manage.py loaddata manager/initial_data/software.json
cd -
```

##### Crear usuario admin
```bash
cd eventol
./manage.py createsuperuser
cd -
```

##### Instalar dependencias de node
```bash
sudo npm install -g less bower yarn
```

##### Instalar dependencias del frontend y compilar los css
```bash
cd eventol/front
yarn install
bower install
lessc eventol/static/manager/less/eventol.less > ../manager/static/manager/css/eventol.css
lessc eventol/static/manager/less/eventol-bootstrap.less > ../manager/static/manager/css/eventol-bootstrap.css
cd -
```

##### Juntar los archivos estaticos
```bash
./manage.py collectstatic --no-input
```

### Correr el servidor para probar y desarrollar
```bash
# python
./eventol/manage.py runserver 0.0.0.0:8000

# In another termina, for react
cd eventol/front
npm start
```

# Actualizar traducciones

## Con Docker
Expand Down
108 changes: 19 additions & 89 deletions docs/es/installation.md
View file
Original file line number Diff line number Diff line change
@@ -1,113 +1,43 @@
# Esta es la instalación para modo desarrollo
Hay dos opciones:
- Con docker (recomendada)
- Directamente en tu maquina
Solo se puede instalar con docker y docker-compose

## Con Docker

### Configurar modo desarrollo y armado de imagenes
### Setup developer mode
```
cp .env.dist .env (Customize if necessary)
cp ./eventol/front/webpack.local-settings.js{.sample,}
cd deploy/docker
cp .env.dist .env
docker-compose pull
docker-compose build --force-rm
docker-compose up -d --build
```

### Esto crea tres contenedores diferentes
### This creates 5 different containers
```
Name Command State Ports
--------------------------------------------------------------------------------------------
eventol_reactjs_1 npm start Up 0.0.0.0:3000->3000/tcp, 8000/tcp
eventol_redis_1 docker-entrypoint.sh redis ... Up 0.0.0.0:32779->6379/tcp
eventol_worker_1 python manage.py runserver ... Up 0.0.0.0:8000->8000/tcp
docker_daphne_1 bash -c cd eventol; daphne ... Up 8000/tcp
docker_postgres_1 docker-entrypoint.sh postgres Up 0.0.0.0:32790->5432/tcp
docker_redis_1 docker-entrypoint.sh redis ... Up 0.0.0.0:32791->6379/tcp
docker_worker_1 /root/wait-for-it.sh -p 54 ... Up 8000/tcp
docker_elasticsearch_1 ... Up 9300/tcp 9200/tcp
```

### Ejecutar el servidor de Django
### Running the django server
```
docker-compose exec worker ./deploy/scripts/install-container-dev.sh
docker-compose exec worker python eventol/manage.py migrate
docker-compose exec worker python eventol/manage.py collectstatic
docker-compose exec worker python eventol/manage.py runserver 0.0.0.0:8000
```


### Ejecutar servidor de React (para desarrollo y hotreloading)
### Running the frontend
```
docker-compose exec reactjs yarn install
docker-compose exec reactjs yarn start
```

## Sin docker

### Npm
Nosotros estamos usando npm para las dependencias del frontend
* [Instalar npm y nodejs](https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager)

### Python 3
Nosotros estamos usando python 3.5 para correr el proyecto

### Instalar dependencias, crear la base de datos y actualizar estaticos

#### Hacerlo desde script
```bash
./deploy/scripts/install.sh
```

#### Hacerlo manualmente

##### Si usas virtualenv (si vas a instalar a mano es recomendable):
```bash
virtualenv -p python3 venv
source venv/bin/activate
```

##### Instalar dependencias de python
```bash
pip install -r requirements.txt -r requirements-dev.txt
### To see the logs of any of them:
```

##### Crear la base de datos y cargar datos de ejemplo
```bash
cd eventol
./manage.py migrate
./manage.py loaddata manager/initial_data/initial_data.json
./manage.py loaddata manager/initial_data/security.json
./manage.py loaddata manager/initial_data/software.json
cd -
```

##### Crear usuario admin
```bash
cd eventol
./manage.py createsuperuser
cd -
```

##### Instalar dependencias de node
```bash
sudo npm install -g less bower yarn
```

##### Instalar dependencias del frontend y compilar los css
```bash
cd eventol/front
yarn install
bower install
lessc eventol/static/manager/less/eventol.less > ../manager/static/manager/css/eventol.css
lessc eventol/static/manager/less/eventol-bootstrap.less > ../manager/static/manager/css/eventol-bootstrap.css
cd -
```

##### Juntar los archivos estaticos
```bash
./manage.py collectstatic --no-input
```

### Correr el servidor para probar y desarrollar
```bash
# python
./eventol/manage.py runserver 0.0.0.0:8000

# En otra terminal para react
cd eventol/front
npm start
docker-compose logs -f [reactjs|worker|redis]
```

# Actualizar traducciones
Expand Down

0 comments on commit b4ce97a

Please sign in to comment.