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

@@ -53,7 +53,7 @@ services:
- cache:/app/tmp/cache
ports:
- "3035" # Webpack dev server
env_file: .env.example
env_file: .env
environment:
- WEBPACKER_DEV_SERVER_HOST=0.0.0.0
- NODE_ENV=development
@@ -76,6 +76,8 @@ services:
redis:
image: redis:alpine
restart: always
command: ["sh", "-c", "redis-server --requirepass \"$REDIS_PASSWORD\""]
env_file: .env
volumes:
- redis:/data/redis
ports: