From 9c135e59dc390a5096e5110ed180b7bbec46161f Mon Sep 17 00:00:00 2001 From: Andras Fekete Date: Thu, 15 Dec 2022 12:22:05 -0500 Subject: [PATCH] Script can run from an arbitrary folder --- Docker/run.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Docker/run.sh b/Docker/run.sh index 78fc99de3..c1d4e2489 100755 --- a/Docker/run.sh +++ b/Docker/run.sh @@ -1,5 +1,9 @@ echo "Running with \"${@}\"..." -docker build -t wolfssl --build-arg UID=$(id -u) --build-arg GID=$(id -g) . && \ -docker run -it -v $(pwd)/..:/tmp/wolfssl -w /tmp/wolfssl wolfssl /bin/bash -c "./autogen.sh && ./configure $(echo ${@}) && make && ./testsuite/testsuite.test" && \ -docker run -it -v $(pwd)/..:/tmp/wolfssl -w /tmp/wolfssl wolfssl /bin/bash + +# Assume we're in wolfssl/Docker +WOLFSSL_DIR=$(builtin cd ${BASH_SOURCE%/*}/..; pwd) + +docker build -t wolfssl --build-arg UID=$(id -u) --build-arg GID=$(id -g) ${WOLFSSL_DIR}/Docker && \ +docker run -it -v ${WOLFSSL_DIR}:/tmp/wolfssl -w /tmp/wolfssl wolfssl /bin/bash -c "./autogen.sh && ./configure $(echo ${@}) && make && ./testsuite/testsuite.test" && \ +docker run -it -v ${WOLFSSL_DIR}:/tmp/wolfssl -w /tmp/wolfssl wolfssl /bin/bash echo "Exited with error code $?"