Merge branch 'master' into sk-upgrade-dependencies

This commit is contained in:
Miguel Serrano
2020-04-27 13:38:21 +02:00
committed by GitHub
14 changed files with 87 additions and 42 deletions

View File

@@ -24,6 +24,7 @@ services:
environment:
ELASTIC_SEARCH_DSN: es:9200
REDIS_HOST: redis
NEW_HISTORY_REDIS_HOST: new_redis
MONGO_HOST: mongo
POSTGRES_HOST: postgres
MOCHA_GREP: ${MOCHA_GREP}
@@ -35,11 +36,15 @@ services:
condition: service_healthy
redis:
condition: service_healthy
new_redis:
condition: service_healthy
command: npm run test:acceptance
redis:
image: redis
new_redis:
image: redis
mongo:
image: mongo:3.6