Tests: use script rather than alias so that bash doesn't need to be interactive shell with a TTY
authorEdouard Tisserant <edouard.tisserant@gmail.com>
Mon, 16 May 2022 13:01:54 +0200
changeset 3458 2c712b8c736f
parent 3457 02c7b758fa9b
child 3459 69771a6ca4a6
Tests: use script rather than alias so that bash doesn't need to be interactive shell with a TTY
tests/tools/Docker/beremiz-sikuli/Dockerfile
tests/tools/Docker/beremiz-sikuli/build_in_docker.sh
--- 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
 
 
--- 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