*: switch from godep to glide

Signed-off-by: Antonio Murdaca <[email protected]>

Makefile

@@ -1,4 +1,4 @@
-.PHONY: all clean conmon ocid ocic
+.PHONY: all clean conmon ocid ocic update-deps
 
 all: conmon ocid ocic
 
@@ -13,3 +13,10 @@ ocic:
 
 clean:
 	rm -f ocic ocid
+
+update-deps:
+	@which glide > /dev/null 2>/dev/null || (echo "ERROR: glide not found." && false)
+	glide update --strip-vcs --strip-vendor --update-vendored --delete
+	glide-vc --only-code --no-tests
+	# see http://sed.sourceforge.net/sed1line.txt
+	find vendor -type f -exec sed -i -e :a -e '/^\n*$$/{$$d;N;ba' -e '}' "{}" \;

glide.yaml

@@ -0,0 +1,28 @@
+package: github.com/kubernetes-incubator/ocid
+import:
+- package: github.com/Sirupsen/logrus
+  version: ~0.10.0
+- package: github.com/containers/image
+  subpackages:
+  - directory
+  - image
+  - transports
+- package: github.com/kubernetes/kubernetes
+  version: ~1.5.0-alpha.0
+  subpackages:
+  - pkg/kubelet/api/v1alpha1/runtime
+- package: github.com/opencontainers/ocitools
+  subpackages:
+  - generate
+- package: github.com/opencontainers/runtime-spec
+  version: ~1.0.0-rc2
+  subpackages:
+  - specs-go
+- package: github.com/rajatchopra/ocicni
+- package: github.com/urfave/cli
+  version: ~1.18.1
+- package: golang.org/x/net
+  subpackages:
+  - context
+- package: google.golang.org/grpc
+  version: ~1.0.1-GA

server/image.go

@@ -44,11 +44,11 @@ func (s *Server) PullImage(ctx context.Context, req *pb.PullImageRequest) (*pb.P
 		return nil, err
 	}
 	// TODO(runcom): figure out the ImageContext story in containers/image instead of passing ("", true)
-	src, err := tr.NewImageSource("", true)
+	src, err := tr.NewImageSource(nil, nil)
 	if err != nil {
 		return nil, err
 	}
-	i := image.FromSource(src, nil)
+	i := image.FromSource(src)
 	blobs, err := i.BlobDigests()
 	if err != nil {
 		return nil, err
@@ -62,7 +62,7 @@ func (s *Server) PullImage(ctx context.Context, req *pb.PullImageRequest) (*pb.P
 		return nil, err
 	}
 	// TODO(runcom): figure out the ImageContext story in containers/image instead of passing ("", true)
-	dest, err := dir.NewImageDestination("", true)
+	dest, err := dir.NewImageDestination(nil)
 	if err != nil {
 		return nil, err
 	}
@@ -73,7 +73,7 @@ func (s *Server) PullImage(ctx context.Context, req *pb.PullImageRequest) (*pb.P
 		if err != nil {
 			return nil, err
 		}
-		if err := dest.PutBlob(b, r); err != nil {
+		if _, _, err := dest.PutBlob(r, b, -1); err != nil {
 			r.Close()
 			return nil, err
 		}