From 521a868ca88a802d539c2ba792721031eb048cdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Fri, 11 Jan 2019 01:14:48 +0100 Subject: [PATCH] Revert "Try to help @mattwr18" This reverts commit 6b4601e9d14d63362877e293b7219d23cf1b4ecd. @mattwr18 for reasons I don't understand, our build server hangs https://travis-ci.com/Human-Connection/Nitro-Web/builds/96979338 Honestly, I start to think this is a bug in `docker-compose` --- .travis.yml | 6 +++--- docker-compose.override.yml | 2 -- docker-compose.travis.yml | 2 -- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1bb87acfd..46a173ae7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,9 +27,9 @@ install: - yarn add cypress-cucumber-preprocessor script: - - docker-compose exec webapp yarn run lint - - docker-compose exec webapp yarn run test - - docker-compose -f ../Nitro-Backend/docker-compose.yml exec backend yarn run db:seed + - docker-compose exec -e NODE_ENV=test webapp yarn run lint + - docker-compose exec -e NODE_ENV=test webapp yarn run test + - docker-compose -f ../Nitro-Backend/docker-compose.yml exec backend yarn run db:seed > /dev/null - wait-on http://localhost:3000 - cypress run --record --key $CYPRESS_TOKEN diff --git a/docker-compose.override.yml b/docker-compose.override.yml index c0c893848..bb7a6c1d1 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -2,8 +2,6 @@ version: '3.7' services: webapp: - environment: - - NODE_ENV=development build: context: . target: build-and-test diff --git a/docker-compose.travis.yml b/docker-compose.travis.yml index cf15e6916..ced9719a2 100644 --- a/docker-compose.travis.yml +++ b/docker-compose.travis.yml @@ -2,8 +2,6 @@ version: "3.7" services: webapp: - environment: - - NODE_ENV=test build: context: . target: build-and-test