diff --git a/jenkins.prepare.sh b/jenkins.prepare.sh index 4997abc..b8fcb77 100755 --- a/jenkins.prepare.sh +++ b/jenkins.prepare.sh @@ -1,6 +1,4 @@ -#!/bin/bash - -set -e +#!/bin/bash -xe docker-compose down diff --git a/npm.sh b/npm.sh index a235e17..22a6c2a 100755 --- a/npm.sh +++ b/npm.sh @@ -1,3 +1,14 @@ -#!/usr/bin/env bash +#!/usr/bin/env -S bash -x -docker-compose run --user="$UID" --rm --service-ports test npm --loglevel warn "$@" + +# the "--no-TTY" option is crucial - without it the output is not captured in Jenkins + +docker-compose run \ + --no-TTY \ + --user="$UID" \ + --rm \ + --service-ports \ + -e BASELINE_DATABASE="baseline" \ + -e "BASELINE_PORT=1433" \ + test \ + npm --loglevel warn "$@"