# HG changeset patch # User Edouard Tisserant # Date 1652698914 -7200 # Node ID 2c712b8c736f6bf142b4c7f5550dc48c3a09ed93 # Parent 02c7b758fa9bd120c7f9721a1dfb1d23caf54a5e Tests: use script rather than alias so that bash doesn't need to be interactive shell with a TTY diff -r 02c7b758fa9b -r 2c712b8c736f tests/tools/Docker/beremiz-sikuli/Dockerfile --- a/tests/tools/Docker/beremiz-sikuli/Dockerfile Mon May 16 07:00:21 2022 +0200 +++ b/tests/tools/Docker/beremiz-sikuli/Dockerfile Mon May 16 13:01:54 2022 +0200 @@ -47,6 +47,10 @@ echo "exec java -jar /usr/local/bin/sikulixide-*.jar \"\$@\"" \ ) | install /dev/stdin /usr/local/bin/sikulix + +RUN echo -e '#!/bin/bash\nmake -f /home/testing/src/beremiz/tests/Makefile' > /usr/local/bin/do_tests +RUN chmod +x /usr/local/bin/do_tests + USER $UNAME RUN mkdir /home/$UNAME/build /home/$UNAME/src /home/$UNAME/test @@ -65,6 +69,5 @@ # easy to remember 'do_tests' alias to invoke main makefile ARG OWNDIRBASENAME=beremiz ENV OWNDIRBASENAME ${OWNDIRBASENAME} -RUN echo "alias do_tests='make -f /home/testing/src/beremiz/tests/Makefile'">/home/$UNAME/.bash_aliases diff -r 02c7b758fa9b -r 2c712b8c736f tests/tools/Docker/beremiz-sikuli/build_in_docker.sh --- a/tests/tools/Docker/beremiz-sikuli/build_in_docker.sh Mon May 16 07:00:21 2022 +0200 +++ b/tests/tools/Docker/beremiz-sikuli/build_in_docker.sh Mon May 16 13:01:54 2022 +0200 @@ -1,8 +1,10 @@ #!/bin/bash +set -e + CONTAINER=beremiz_sikuli_current docker start $CONTAINER -docker exec $CONTAINER bash -i -c "do_tests $1" +docker exec $CONTAINER bash -c "do_tests $1" docker stop $CONTAINER