github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-30 09:13:29 +00:00
Code Issues Projects Releases Wiki Activity

scripts: Fix static build docker config script

Browse Source 
Fix bug in the `kata-configure-docker.sh` script which assumed
`/etc/docker/` existed by default.

Fixes: #800

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
This commit is contained in:
James O. D. Hunt 2019-11-11 13:40:16 +00:00
parent fbee390e32
commit 14558de630
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
static-build/scripts/kata-configure-docker.sh
View File

@ -12,7 +12,8 @@ set -o errexit
set -o nounset
set -o pipefail
docker_config_file="${docker_config_file:-/etc/docker/daemon.json}"
docker_config_dir="/etc/docker"
docker_config_file="${docker_config_file:-${docker_config_dir}/daemon.json}"
# The static version of Kata Containers is entirely contained within
# this directory.
@ -39,6 +40,8 @@ configure_docker()
local file="$1"
[ -z "$file" ] && die "need file"
mkdir -p "${docker_config_dir}"
if [ -e "$docker_config_file" ]
then
local today=$(date '+%Y-%m-%d')
@ -47,6 +50,9 @@ configure_docker()
info "Backing up original Docker config file '$docker_config_file' to '$backup'"
sudo cp "${docker_config_file}" "${docker_config_file}.${today}"
else
# Create a minimal valid JSON document
echo "{}" > "${docker_config_file}"
fi
local config_files=$(tar tvf "$file" |\