diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2020-10-08 16:48:53 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2020-10-12 15:07:27 +0000 |
| commit | 8b6fa8104783bf002ea5f756d60aeb5f09d1037e (patch) | |
| tree | 059f31f08df063844a6f9a0276038436ba31faa4 /start-container-docker.sh | |
| parent | 88c6534f94135bd3dc5754b35effb6c23a7519e9 (diff) | |
start-container-docker.sh: Use main system /home
... and drop support for host-home docker volume.
See https://review.linaro.org/c/ci/dockerfiles/+/36586 for rationale.
Change-Id: Ic5f63df7296bc21002fee87ce78c4e1d855167fd
Diffstat (limited to 'start-container-docker.sh')
| -rwxr-xr-x | start-container-docker.sh | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/start-container-docker.sh b/start-container-docker.sh index b3f3a66f..6fbec8e4 100755 --- a/start-container-docker.sh +++ b/start-container-docker.sh @@ -253,12 +253,6 @@ fi IFS=" " read -r -a bind_mounts <<< "$(print_bind_mounts "$task" "$SSH $session_host")" -docker_root="" -if $SSH $session_host test -f "/.dockerenv" \ - && $SSH $session_host mount | grep -q "/run/docker.sock "; then - docker_root=$($DOCKER info | grep "Docker Root Dir:" | cut -d: -f 2) -fi - bind_mounted_workspace=false bind_mounts_opt=() for bind_mount in "${bind_mounts[@]}"; do @@ -274,13 +268,6 @@ for bind_mount in "${bind_mounts[@]}"; do case "$dir" in "/home/"*) $dryruncmd $SSH $session_host mkdir -p "$dir" - - if [ x"$docker_root" != x"" ]; then - # If inside "host" container (with proxied docker and /home from - # host-home volume), convert paths to refer to volume's path on - # bare-metal. - dir=$(echo "$dir" | sed -e "s#^/home/#$docker_root/volumes/host-home/_data/#") - fi ;; esac |