diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2019-08-27 14:17:57 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2019-08-29 06:11:08 +0000 |
| commit | 518197a4f4f4ae0ef81986039b5ff98152542be5 (patch) | |
| tree | ccede098798184edc5e72ca41cef62716be3797d /jenkins-helpers.sh | |
| parent | 43a545bf1baf2da7642e43fb175ecb9a7f584d90 (diff) | |
start-container-docker.sh: Fix container startup on remote target
Fix conversion of bind-mount paths for remote host-container-enabled
targets. At the moment we check whether current machine is
host-container-enabled (and convert paths), rather than the target.
Change-Id: Iccb48cc9533d9674a00064c55c47751f8e115ffc
Diffstat (limited to 'jenkins-helpers.sh')
| -rw-r--r-- | jenkins-helpers.sh | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/jenkins-helpers.sh b/jenkins-helpers.sh index 7c25e7dd..b8cc5222 100644 --- a/jenkins-helpers.sh +++ b/jenkins-helpers.sh @@ -767,25 +767,6 @@ print_volume_mounts () ) } -# Print path converted to docker's daemon level -# $1: path -print_docker_path () -{ - ( - set -euf -o pipefail - local path="$1" - if [ -f "/.dockerenv" ] && mount | grep -q "/run/docker.sock "; 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. - local docker_root - docker_root=$(docker info | grep "Docker Root Dir:" | cut -d: -f 2) - echo "$path" | sed -e "s#^/home/#$docker_root/volumes/host-home/_data/#" - else - echo "$path" - fi - ) -} - # Return zero if bash array is defined. # $1: Name of bash array test_array() |