Remove oci package

Replace functionality in client with simple tar writer

Signed-off-by: Derek McGowan <derek@mcgstyle.net>

content/content.go

@@ -5,7 +5,6 @@ import (
 	"io"
 	"time"
 
-	"github.com/containerd/containerd/oci"
 	"github.com/opencontainers/go-digest"
 )
 
@@ -83,8 +82,20 @@ type IngestManager interface {
 }
 
 type Writer interface {
-	oci.BlobWriter
+	// Close is expected to be called after Commit() when commission is needed.
+	io.WriteCloser
+
+	// Digest may return empty digest or panics until committed.
+	Digest() digest.Digest
+
+	// Commit commits the blob (but no roll-back is guaranteed on an error).
+	// size and expected can be zero-value when unknown.
+	Commit(size int64, expected digest.Digest) error
+
+	// Status returns the current state of write
 	Status() (Status, error)
+
+	// Truncate updates the size of the target blob
 	Truncate(size int64) error
 }
 

content/local/writer.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/containerd/containerd/content"
 	"github.com/containerd/containerd/errdefs"
-	"github.com/containerd/containerd/oci"
 	"github.com/opencontainers/go-digest"
 	"github.com/pkg/errors"
 )
@@ -79,7 +78,7 @@ func (w *writer) Commit(size int64, expected digest.Digest) error {
 	}
 
 	if size > 0 && size != fi.Size() {
-		return oci.ErrUnexpectedSize{Expected: size, Actual: fi.Size()}
+		return errors.Errorf("unexpected commit size %d, expected %d", fi.Size(), size)
 	}
 
 	if err := w.fp.Close(); err != nil {
@@ -88,7 +87,7 @@ func (w *writer) Commit(size int64, expected digest.Digest) error {
 
 	dgst := w.digester.Digest()
 	if expected != "" && expected != dgst {
-		return oci.ErrUnexpectedDigest{Expected: expected, Actual: dgst}
+		return errors.Errorf("unexpected commit digest %s, expected %s", dgst, expected)
 	}
 
 	var (