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

*: support insecure registries

Browse source 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
This commit is contained in:
Antonio Murdaca 2017-06-08 15:45:34 +02:00
parent 8441dca284
commit 8b53fabcbd
No known key found for this signature in database
GPG key ID: B2BEAD150DE936B9
6 changed files with 129 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

3
server/config.go
View file

@ -117,6 +117,9 @@ type ImageConfig struct {
// that this be left unspecified so that the default system-wide policy
// will be used.
SignaturePolicyPath string `toml:"signature_policy"`
// InsecureRegistries is a list of registries that must be contacted w/o
// TLS verification.
InsecureRegistries []string `toml:"insecure_registries"`
}
// NetworkConfig represents the "crio.network" TOML config table

4
server/image_pull.go
View file

@ -38,8 +38,6 @@ func (s *Server) PullImage(ctx context.Context, req *pb.PullImageRequest) (*pb.P
}
}
options := &copy.Options{
// TODO: we need a way to specify insecure registries like docker
//DockerInsecureSkipTLSVerify: true,
SourceCtx: &types.SystemContext{},
}
// a not empty username should be sufficient to decide whether to send auth
@ -53,7 +51,7 @@ func (s *Server) PullImage(ctx context.Context, req *pb.PullImageRequest) (*pb.P
}
}
canPull, err := s.storageImageServer.CanPull(image, options.SourceCtx)
canPull, err := s.storageImageServer.CanPull(image, options)
if err != nil && !canPull {
return nil, err
}

2
server/server.go
View file

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