diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh index c595624a66..642911eb1c 100644 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -253,6 +253,13 @@ function assemble-docker-flags { if [[ "${TEST_CLUSTER:-}" == "true" ]]; then docker_opts+=" --debug" fi + # Decide whether to enable a docker registry mirror. This is taken from + # the "kube-env" metadata value. + if [[ -n "${DOCKER_REGISTRY_MIRROR_URL:-}" ]]; then + echo "Enable docker registry mirror at: ${DOCKER_REGISTRY_MIRROR_URL}" + docker_opts+=" --registry-mirror=${DOCKER_REGISTRY_MIRROR_URL}" + fi + echo "DOCKER_OPTS=\"${docker_opts} ${EXTRA_DOCKER_OPTS:-}\"" > /etc/default/docker } diff --git a/cluster/gce/trusty/configure-helper.sh b/cluster/gce/trusty/configure-helper.sh index ea3ded99cb..84339515fa 100644 --- a/cluster/gce/trusty/configure-helper.sh +++ b/cluster/gce/trusty/configure-helper.sh @@ -187,6 +187,13 @@ restart_docker_daemon() { if [ "${TEST_CLUSTER:-}" = "true" ]; then DOCKER_OPTS="${DOCKER_OPTS} --debug" fi + # Decide whether to enable a docker registry mirror. This is taken from + # the "kube-env" metadata value. + if [ -n "${DOCKER_REGISTRY_MIRROR_URL:-}" ]; then + echo "Enable docker registry mirror at: ${DOCKER_REGISTRY_MIRROR_URL}" + DOCKER_OPTS="${DOCKER_OPTS} --registry-mirror=${DOCKER_REGISTRY_MIRROR_URL}" + fi + echo "DOCKER_OPTS=\"${DOCKER_OPTS} ${EXTRA_DOCKER_OPTS:-}\"" > /etc/default/docker # Make sure the network interface cbr0 is created before restarting docker daemon while ! [ -L /sys/class/net/cbr0 ]; do