Merge 327cc9bfa4 into aee7dea272

cmd/crio/main.go

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

lib/config.go

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