summaryrefslogtreecommitdiff
path: root/start-container-docker.sh
diff options
context:
space:
mode:
authorMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2018-11-01 09:58:14 +0000
committerMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2018-11-06 16:58:30 +0000
commit58aad50f763669b7dae1173a208aae5ec6b373df (patch)
treec6071a9f055b4bb9cbb24253e1595a83b95730bb /start-container-docker.sh
parent521097216d4fd72117e74650aabf7d6396dc49a1 (diff)
start-container-docker.sh: Add ccache volume handling
... by adding new print_volume_mounts helper. Change-Id: Ifaaf4c2a9f60b74cbf2ee54f28c49e3135b1c1e4
Diffstat (limited to 'start-container-docker.sh')
-rwxr-xr-xstart-container-docker.sh9
1 files changed, 9 insertions, 0 deletions
diff --git a/start-container-docker.sh b/start-container-docker.sh
index ea457484..a0f09aa7 100755
--- a/start-container-docker.sh
+++ b/start-container-docker.sh
@@ -220,6 +220,10 @@ memory=$(print_memory_limit "$task" "$weight" "$nproc")
pids=$(print_pids_limit "$task" "$weight")
cpus=$(print_cpu_shares "$task" "$weight")
+if [ x"${JOB_NAME:+set}" = x"set" ]; then
+ job_name="$JOB_NAME"
+fi
+
bind_mounts=($(print_bind_mounts "$task"))
bind_mounts_opt=()
@@ -234,6 +238,11 @@ for bind_mount in "${bind_mounts[@]}"; do
bind_mounts_opt=("${bind_mounts_opt[@]}" "-v" "$docker_dir:$bind_mount")
done
+volume_mounts=($(print_volume_mounts "$job_name" "-$container_arch-$distro"))
+for mount in "${volume_mounts[@]}"; do
+ bind_mounts_opt=("${bind_mounts_opt[@]}" "-v" "$mount")
+done
+
docker_run=($DOCKER run --name $session_name -dtP \
"${bind_mounts_opt[@]}" \
${SECURITY} \