vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #674 from runcom/additional-registries

Browse source 
*: implement additional pull registries
This commit is contained in:
Mrunal Patel 2017-08-02 17:42:58 -07:00 • committed by GitHub
commit 66d96e77e3
13 changed files with 337 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libkpod/config.go
View file

@ -160,6 +160,8 @@ type ImageConfig struct {
InsecureRegistries []string `toml:"insecure_registries"`
// ImageVolumes controls how volumes specified in image config are handled
ImageVolumes ImageVolumesType `toml:"image_volumes"`
// Registries holds a list of registries used to pull unqualified images
Registries []string `toml:"registries"`
}
// NetworkConfig represents the "crio.network" TOML config table

2
libkpod/container_server.go
View file

@ -103,7 +103,7 @@ func New(config *Config) (*ContainerServer, error) {
return nil, err
}
imageService, err := storage.GetImageService(store, config.DefaultTransport, config.InsecureRegistries)
imageService, err := storage.GetImageService(store, config.DefaultTransport, config.InsecureRegistries, config.Registries)
if err != nil {
return nil, err
}