Docker: Add DOCKER env variable, e.g. for 'sudo docker'

tools/docker/build_test.sh

@@ -14,6 +14,6 @@ shift
 echo "Building ${TESTNAME} ..."
 
 set -x
-docker build -t "img_cp2k_test_${TESTNAME}" "$@" -f "Dockerfile.test_${TESTNAME}" .
+${DOCKER:-docker} build -t "img_cp2k_test_${TESTNAME}" "$@" -f "Dockerfile.test_${TESTNAME}" .
 
 #EOF

tools/docker/run_test.sh

@@ -17,7 +17,7 @@ CP2K_LOCAL=$(realpath ../../)
 set -x
 
 # SYS_PTRACE needed by LeakSanitizer.
-docker run -i --init --rm --cap-add=SYS_PTRACE \
+${DOCKER:-docker} run -i --init --rm --cap-add=SYS_PTRACE \
   --volume "${CP2K_LOCAL}:/mnt/cp2k/:ro" \
   "$@" "img_cp2k_test_${TESTNAME}"
 

tools/docker/run_test_master.sh

@@ -0,0 +1,27 @@
+#!/bin/bash -e
+
+# author: Ole Schuett
+
+if (( $# < 1 )); then
+    echo "usage: run_test_master.sh <test_name> [additional-docker-run-args]"
+    echo "example: run_test_master.sh python"
+    exit 1
+fi
+
+set -e
+TESTNAME=$1
+shift
+
+GIT_BRANCH="master"
+GIT_REF="origin/master"
+echo "Running ${TESTNAME} on Branch ${GIT_BRANCH} (ref: ${GIT_REF})..."
+
+set -x
+
+# SYS_PTRACE needed by LeakSanitizer.
+${DOCKER:-docker} run -i --init --rm --cap-add=SYS_PTRACE \
+  -e "GIT_BRANCH=${GIT_BRANCH}" -e "GIT_REF=${GIT_REF}" \
+  "$@" "img_cp2k_test_${TESTNAME}"
+
+
+#EOF

tools/docker/run_test_pr.sh

@@ -23,6 +23,6 @@ echo "Running ${TESTNAME} on Branch ${GIT_BRANCH} (ref: ${GIT_REF})..."
 set -o xtrace
 
 # SYS_PTRACE needed by LeakSanitizer.
-docker run -i --init --rm --cap-add=SYS_PTRACE \
+${DOCKER:-docker} run -i --init --rm --cap-add=SYS_PTRACE \
     -e "GIT_BRANCH=${GIT_BRANCH}" -e "GIT_REF=${GIT_REF}" \
     "$@" "img_cp2k_test_${TESTNAME}"