github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-28 16:27:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #801 from jodh-intel/fix-static-binaries-docker-cfg-script

Browse Source 
scripts: Fix static build docker config script
This commit is contained in:
Eric Ernst 2019-11-13 16:53:14 -08:00 committed by GitHub
commit 733710c8e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 nounset
set -o pipefail 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 # The static version of Kata Containers is entirely contained within
# this directory. # this directory.
@ -39,6 +40,8 @@ configure_docker()
local file="$1" local file="$1"
[ -z "$file" ] && die "need file" [ -z "$file" ] && die "need file"
mkdir -p "${docker_config_dir}"
if [ -e "$docker_config_file" ] if [ -e "$docker_config_file" ]
then then
local today=$(date '+%Y-%m-%d') local today=$(date '+%Y-%m-%d')
@ -47,6 +50,9 @@ configure_docker()
info "Backing up original Docker config file '$docker_config_file' to '$backup'" info "Backing up original Docker config file '$docker_config_file' to '$backup'"
sudo cp "${docker_config_file}" "${docker_config_file}.${today}" sudo cp "${docker_config_file}" "${docker_config_file}.${today}"
else
# Create a minimal valid JSON document
echo "{}" > "${docker_config_file}"
fi fi
local config_files=$(tar tvf "$file" |\ local config_files=$(tar tvf "$file" |\