From 9a91accae9c488c283f7ab3b35f3add63421f51a Mon Sep 17 00:00:00 2001 From: Ivan Mikushin Date: Tue, 19 May 2015 19:34:34 +0500 Subject: [PATCH] preload images --- config/default.go | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/config/default.go b/config/default.go index 27bd9872..be7ea414 100644 --- a/config/default.go +++ b/config/default.go @@ -203,6 +203,22 @@ func NewConfig() *Config { }, LogDriver: "json-file", }, + "preload-system-images": { + Image: "preload", + Privileged: true, + Labels: project.NewSliceorMap(map[string]string{ + DETACH: "false", + SCOPE: SYSTEM, + }), + VolumesFrom: []string{ + "command-volumes", + "system-volumes", + }, + Volumes: []string{ + "/var/run/system-docker.sock:/var/run/docker.sock", + "/var/lib/system-docker/preload:/mnt/preload", + }, + }, "cloud-init-pre": { Image: "cloudinit", Privileged: true, @@ -311,6 +327,25 @@ func NewConfig() *Config { "all-volumes", }, }, + "preload-user-images": { + Image: "preload", + Privileged: true, + Labels: project.NewSliceorMap(map[string]string{ + DETACH: "false", + SCOPE: SYSTEM, + }), + Links: []string{ + "dockerwait", + }, + VolumesFrom: []string{ + "command-volumes", + "system-volumes", + }, + Volumes: []string{ + "/var/run/docker.sock:/var/run/docker.sock", + "/var/lib/docker/preload:/mnt/preload", + }, + }, "console": { Image: "console", Privileged: true,