From b97fa9ed4aca66c229ad431d99f44acceafa83de Mon Sep 17 00:00:00 2001 From: jamesread Date: Tue, 2 Nov 2021 17:14:18 +0000 Subject: [PATCH] configs path --- integration-tests/Makefile | 2 +- integration-tests/cypressRun.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/integration-tests/Makefile b/integration-tests/Makefile index c3929de..c08087a 100644 --- a/integration-tests/Makefile +++ b/integration-tests/Makefile @@ -4,7 +4,7 @@ container: tar xavf OliveTin-*linux-amd64.tar.gz docker rm -f olivetin && docker rmi -f olivetin docker build -t olivetin:latest OliveTin-*linux-amd64/ - docker create --name olivetin -p 1337:1337 -v `pwd`/config/:/config/ olivetin + docker create --name olivetin -p 1337:1337 -v `pwd`/configs/:/config/ olivetin cypress: npm install diff --git a/integration-tests/cypressRun.sh b/integration-tests/cypressRun.sh index df47190..9732a15 100755 --- a/integration-tests/cypressRun.sh +++ b/integration-tests/cypressRun.sh @@ -4,7 +4,7 @@ set -o xtrace echo "Running config $1" -cp -f ./configs/config.$1.yaml ./config/config.yaml +cp -f ./configs/config.$1.yaml ./configs/config.yaml docker start olivetin NO_COLOR=1 ./node_modules/.bin/cypress run --headless -s cypress/integration/$1/* || true docker kill olivetin