diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index 21d2b348592..e86c3877520 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -270,6 +270,11 @@ if [[ -n "${DISABLE_DOCKER_LIVE_RESTORE:-}" ]]; then PROVIDER_VARS="${PROVIDER_VARS:-} DISABLE_DOCKER_LIVE_RESTORE" fi +# Override default docker storage driver. +if [[ -n "${DOCKER_STORAGE_DRIVER:-}" ]]; then + PROVIDER_VARS="${PROVIDER_VARS:-} DOCKER_STORAGE_DRIVER" +fi + # Override default GLBC image if [[ -n "${GCE_GLBC_IMAGE:-}" ]]; then PROVIDER_VARS="${PROVIDER_VARS:-} GCE_GLBC_IMAGE" diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index f3ecaa82821..a28b593fff4 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -307,6 +307,11 @@ if [[ -n "${DISABLE_DOCKER_LIVE_RESTORE:-}" ]]; then PROVIDER_VARS="${PROVIDER_VARS:-} DISABLE_DOCKER_LIVE_RESTORE" fi +# Override default docker storage driver. +if [[ -n "${DOCKER_STORAGE_DRIVER:-}" ]]; then + PROVIDER_VARS="${PROVIDER_VARS:-} DOCKER_STORAGE_DRIVER" +fi + # Override default GLBC image if [[ -n "${GCE_GLBC_IMAGE:-}" ]]; then PROVIDER_VARS="${PROVIDER_VARS:-} GCE_GLBC_IMAGE" diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh index 54b025b1ed8..0fba1bcfeea 100644 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -852,6 +852,12 @@ function assemble-docker-flags { docker_opts+=" --live-restore=false" fi + # Override docker storage driver if the environment variable is set + + if [[ -n "${DOCKER_STORAGE_DRIVER:-}" ]]; then + docker_opts+=" --storage-driver=${DOCKER_STORAGE_DRIVER}" + fi + echo "DOCKER_OPTS=\"${docker_opts} ${EXTRA_DOCKER_OPTS:-}\"" > /etc/default/docker if [[ "${use_net_plugin}" == "true" ]]; then