Merge pull request #181 from marcov/set-runtime

tests: handle docker set runtime for systemd / sysconfig
This commit is contained in:
Archana Shinde 2018-10-08 15:50:52 -07:00 committed by GitHub
commit 647e535c5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -190,16 +190,15 @@ set_runtime()
# Travis doesn't support VT-x # Travis doesn't support VT-x
[ -n "${TRAVIS:-}" ] && return [ -n "${TRAVIS:-}" ] && return
source /etc/os-release if [ -f "$sysconfig_docker_config_file" ]; then
if [[ "${ID_LIKE:-}" =~ suse ]]; then
docker_config_file="$sysconfig_docker_config_file" docker_config_file="$sysconfig_docker_config_file"
sed_script="s|^( *DOCKER_OPTS=.+--default-runtime[= ] *)[^ \"]+(.*\"$)|\1${name}\2|g"
else else
docker_config_file="$systemd_docker_config_file" docker_config_file="$systemd_docker_config_file"
sed_script="s/--default-runtime[= ][^ ]*/--default-runtime=${name}/g"
fi fi
sudo -E sed -i "s/--default-runtime=[^ ][^ ]*/--default-runtime=${name}/g" \ sudo -E sed -i -E "$sed_script" "$docker_config_file"
"${docker_config_file}"
sudo -E systemctl daemon-reload sudo -E systemctl daemon-reload
sudo -E systemctl restart docker sudo -E systemctl restart docker
} }