vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

Update comments in rootfs and for desciptor

Browse source 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
This commit is contained in:
Derek McGowan 2017-03-10 22:05:27 -08:00
parent 3a20dd41d5
commit 340e56ecd0
No known key found for this signature in database
GPG key ID: F58C5D0A4405ACDB
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
api/types/descriptor/descriptor.proto
View file

@ -4,6 +4,11 @@ package containerd.v1.types;
import "gogoproto/gogo.proto"; import "gogoproto/gogo.proto";
// Descriptor describes a blob in a content store.
//
// This descriptor can be used to reference content from an
// oci descriptor found in a manifest.
// See https://godoc.org/github.com/opencontainers/image-spec/specs-go/v1#Descriptor
message Descriptor { message Descriptor {
string mediaType = 1; string mediaType = 1;
string digest = 2 [(gogoproto.customtype) = "github.com/opencontainers/go-digest.Digest", (gogoproto.nullable) = false]; string digest = 2 [(gogoproto.customtype) = "github.com/opencontainers/go-digest.Digest", (gogoproto.nullable) = false];

4
rootfs/init.go
View file

@ -24,7 +24,7 @@ func InitRootFS(ctx context.Context, name string, parent digest.Digest, readonly
if err == nil { if err == nil {
return nil, errors.Errorf("rootfs already exists") return nil, errors.Errorf("rootfs already exists")
} }
// TODO: check if should return error // TODO: ensure not exist error once added to snapshot package
parentS := parent.String() parentS := parent.String()
@ -53,7 +53,7 @@ func createInitLayer(ctx context.Context, parent, initName string, initFn func(s
if _, err := snapshotter.Stat(ctx, initS); err == nil { if _, err := snapshotter.Stat(ctx, initS); err == nil {
return initS, nil return initS, nil
} }
// TODO: check if should return error // TODO: ensure not exist error once added to snapshot package
// Create tempdir // Create tempdir
td, err := ioutil.TempDir("", "create-init-") td, err := ioutil.TempDir("", "create-init-")