From 39922220b0fe1f04504f6f68a0aa7df1fd719077 Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Tue, 20 Jun 2017 15:26:30 +1000 Subject: [PATCH] Merge pull request #1930 from SvenDowideit/use-engine-registry-mirror Use engine registry mirror (cherry picked from commit 1e3cd14af726c61a3d98a042f242e8e123bc4e51) --- scripts/run-common | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/run-common b/scripts/run-common index 62b7475e..d4f45093 100755 --- a/scripts/run-common +++ b/scripts/run-common @@ -48,4 +48,8 @@ REBUILD=1 QEMUARCH=${qemuarch["${ARCH}"]} TTYCONS=${ttycons["${ARCH}"]} -DEFAULT_KERNEL_ARGS="printk.devkmsg=on rancher.debug=true rancher.password=rancher console=${TTYCONS} rancher.autologin=${TTYCONS}" +if [ "$ENGINE_REGISTRY_MIRROR" != "" ]; then + REGISTRY_MIRROR="rancher.bootstrap_docker.registry_mirror=${ENGINE_REGISTRY_MIRROR} rancher.system_docker.registry_mirror=${ENGINE_REGISTRY_MIRROR} rancher.docker.registry_mirror=${ENGINE_REGISTRY_MIRROR}" +fi + +DEFAULT_KERNEL_ARGS="printk.devkmsg=on rancher.debug=true rancher.password=rancher console=${TTYCONS} rancher.autologin=${TTYCONS} ${REGISTRY_MIRROR} "