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

server: refactor to use Config struct

Browse source 
This paves the way for having a configuration file that is loaded rather
than everything being set via the command-line.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
This commit is contained in:
Aleksa Sarai 2016-10-10 20:57:40 +11:00
parent 3f48986ea0
commit 7bf5110b76
No known key found for this signature in database
GPG key ID: 9E18AA267DDB8DB4
5 changed files with 230 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

4
server/image.go
View file

@ -55,10 +55,10 @@ func (s *Server) PullImage(ctx context.Context, req *pb.PullImageRequest) (*pb.P
return nil, err
}
if err = os.Mkdir(filepath.Join(imageStore, tr.StringWithinTransport()), 0755); err != nil {
if err = os.Mkdir(filepath.Join(s.config.ImageStore, tr.StringWithinTransport()), 0755); err != nil {
return nil, err
}
dir, err := directory.NewReference(filepath.Join(imageStore, tr.StringWithinTransport()))
dir, err := directory.NewReference(filepath.Join(s.config.ImageStore, tr.StringWithinTransport()))
if err != nil {
return nil, err
}