Merge branch 'hotfix/1.0.3' into develop

# Conflicts:
#	config/cable.yml
#	docs/development/environment-setup/docker.md
This commit is contained in:
sony-mathew
2020-01-26 22:51:39 +05:45
7 changed files with 39 additions and 6 deletions

View File

@@ -11,7 +11,8 @@ After cloning the repo and installing docker on your machine, run the following
cp .env.example .env
```
Make changes to the `.env` file as required. [Optional]
Make changes to the `.env` file as required [Optional]. If you want to set the password for redis when you run
docker-compose, set any string value to the environment variable `REDIS_PASSWORD` in the `.env` file. which will secure the redis running inside docker-compose with this password. This will be automatically picked up by app server and sidekiq, to authenticate while making connections to redis server.
```bash
docker-compose build

View File

@@ -59,7 +59,7 @@ But you can change it to use any of the cloud providers like amazon s3, microsof
ACTIVE_STORAGE_SERVICE='local'
```
### Configure Redis URL
### Configure Redis
For development, you can use the following url to connect to redis.
@@ -67,6 +67,13 @@ For development, you can use the following url to connect to redis.
REDIS_URL='redis:://127.0.0.1:6379'
```
To authenticate redis connections made by app server and sidekiq, if it's protected by a password, use the following
environment variable to set the password.
```bash
REDIS_PASSWORD=
```
### Configure Postgres host
You can set the following environment variable to set the host for postgres.