Add default registry

Signed-off-by: Haoran Wang <haowang@redhat.com>
This commit is contained in:
Haoran Wang 2017-12-12 15:15:55 +08:00
parent 85f303f3ff
commit 327cc9bfa4
2 changed files with 3 additions and 1 deletions

View file

@ -509,7 +509,7 @@ func main() {
if graceful && strings.Contains(strings.ToLower(err.Error()), "use of closed network connection") { if graceful && strings.Contains(strings.ToLower(err.Error()), "use of closed network connection") {
err = nil err = nil
} else { } else {
logrus.Errorf("Failed to serve grpc grpc request: %v", err) logrus.Errorf("Failed to serve grpc request: %v", err)
} }
} }
}() }()

View file

@ -24,6 +24,7 @@ const (
cgroupManager = oci.CgroupfsCgroupsManager cgroupManager = oci.CgroupfsCgroupsManager
lockPath = "/run/crio.lock" lockPath = "/run/crio.lock"
containerExitsDir = oci.ContainerExitsDir containerExitsDir = oci.ContainerExitsDir
defaultRegistry = "docker.io"
) )
// Config represents the entire set of configuration values that can be set for // Config represents the entire set of configuration values that can be set for
@ -302,6 +303,7 @@ func DefaultConfig() *Config {
PauseCommand: pauseCommand, PauseCommand: pauseCommand,
SignaturePolicyPath: "", SignaturePolicyPath: "",
ImageVolumes: ImageVolumesMkdir, ImageVolumes: ImageVolumesMkdir,
Registries: []string{defaultRegistry},
}, },
NetworkConfig: NetworkConfig{ NetworkConfig: NetworkConfig{
NetworkDir: cniConfigDir, NetworkDir: cniConfigDir,