Skip to content

Commit

Permalink
Merge pull request kubernetes#104180 from SergeyKanzhelev/automated-c…
Browse files Browse the repository at this point in the history
…herry-pick-of-#104135-upstream-release-1.20

Automated cherry pick of kubernetes#104135: Update configure-helper.sh
  • Loading branch information
k8s-ci-robot authored Aug 6, 2021
2 parents b993029 + 593ed98 commit 0cedc03
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions cluster/gce/gci/configure-helper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1496,11 +1496,12 @@ function set_docker_options_non_ubuntu() {

addockeropt "\"mtu\": 1460,"
addockeropt "\"storage-driver\": \"overlay2\","

echo "setting live restore"
# Disable live-restore if the environment variable is set.
if [[ "${DISABLE_DOCKER_LIVE_RESTORE:-false}" == "true" ]]; then
addockeropt "\"live-restore\": \"false\","
addockeropt "\"live-restore\": false,"
else
addockeropt "\"live-restore\": true,"
fi
}

Expand Down Expand Up @@ -1548,6 +1549,7 @@ addockeropt "\"pidfile\": \"/var/run/docker.pid\",
disable_aufs
set_docker_options_non_ubuntu


echo "setting docker logging options"
# Configure docker logging
addockeropt "\"log-driver\": \"${DOCKER_LOG_DRIVER:-json-file}\","
Expand Down

0 comments on commit 0cedc03

Please sign in to comment.