(#75) fixed container startup when different user and command is used

sakuli · Nov 9, 2020 · 66e6832 · 66e6832
1 parent 9eff4f7
commit 66e6832
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/.test/test.sh b/.test/test.sh
@@ -52,4 +52,13 @@ docker run \
     -e SAKULI_LICENSE_KEY=${SAKULI_LICENSE_KEY} \
     --shm-size=2G \
     taconsol/sakuli:${1:-latest} \
+    "echo success!"
+
+# start with different user and another command than sakuli
+docker run \
+    --rm \
+    -e SAKULI_LICENSE_KEY=${SAKULI_LICENSE_KEY} \
+    --shm-size=2G \
+    -u 45678:12345 \
+    taconsol/sakuli:${1:-latest}  \
     "echo success!"
diff --git a/src/common/scripts/execute_testsuite.sh b/src/common/scripts/execute_testsuite.sh
@@ -55,7 +55,7 @@ else
   pushd ${SAKULI_EXECUTION_DIR}
 fi
 # unknown option ==> call command
-echo -e "\n\n------------------ EXECUTE COMMAND ------------------"
+echo -e "\n\n------------------ EXECUTE SAKULI ------------------"
 echo "Executing command: '$@'"
 $@
 SAKULI_RETURN_CODE=$?

diff --git a/src/common/scripts/vnc_startup.sh b/src/common/scripts/vnc_startup.sh
@@ -73,4 +73,11 @@ if [[ $DEBUG == true ]]; then
     tail ${TAIL_PARAMETERS} $STARTUPDIR/*.log $HOME/.vnc/*$DISPLAY.log
 fi
 
-$STARTUPDIR/execute_testsuite.sh "$@"
+if [[ "${SAKULI_TEST_SUITE}" || "${GIT_URL}" ]]; then
+  echo "Executing Testsuite"
+  "$STARTUPDIR"/execute_testsuite.sh "$@"
+else
+  echo -e "\n\n------------------ EXECUTE COMMAND ------------------"
+  echo "Executing command: '$@'"
+  $@
+fi