WIP- vendor containers/{image,storage}

.travis.yml

@@ -87,7 +87,7 @@ script:
     - make install.tools install.libseccomp.sudo all runc validate SECURITYTAGS="apparmor seccomp"
     - go test -c -tags "apparmor seccomp `./btrfs_tag.sh` `./libdm_tag.sh` `./ostree_tag.sh` `./selinux_tag.sh`" ./cmd/buildah
     - tmp=`mktemp -d`; mkdir $tmp/root $tmp/runroot; sudo PATH="$PATH" ./buildah.test -test.v --root $tmp/root --runroot $tmp/runroot --storage-driver vfs --signature-policy `pwd`/tests/policy.json --registries-conf `pwd`/tests/registries.conf
-    - cd tests; travis_wait 60 sudo PATH="$PATH" ./test_runner.sh
+    - cd tests; sudo PATH="$PATH" ./test_runner.sh
     - cd ..
 after_script:
     - echo "Run conformance tests in Fedora container..."

pkg/blobcache/blobcache.go

@@ -416,6 +416,18 @@ func (s *blobCacheDestination) HasThreadSafePutBlob() bool {
 	return s.destination.HasThreadSafePutBlob()
 }
 
+func (s *blobCacheDestination) SupportsBlobLocks() bool {
+	return false
+}
+
+func (s *blobCacheDestination) LockBlob(b types.BlobInfo) error {
+	return nil
+}
+
+func (s *blobCacheDestination) UnlockBlob(b types.BlobInfo) error {
+	return nil
+}
+
 func (d *blobCacheDestination) PutBlob(ctx context.Context, stream io.Reader, inputInfo types.BlobInfo, cache types.BlobInfoCache, isConfig bool) (types.BlobInfo, error) {
 	var tempfile *os.File
 	var err error

vendor.conf

@@ -3,12 +3,12 @@ github.com/blang/semver v3.5.0
 github.com/BurntSushi/toml v0.2.0
 github.com/containerd/continuity 004b46473808b3e7a4a3049c20e4376c91eb966d
 github.com/containernetworking/cni v0.7.0-rc2
-github.com/containers/image f52cf78ebfa1916da406f8b6210d8f7764ec1185
-github.com/vbauerster/mpb v3.3.4
+github.com/containers/image copy-detection https://github.com/vrothberg/image
+github.com/vbauerster/mpb v3.4.0
 github.com/mattn/go-isatty v0.0.4
 github.com/VividCortex/ewma v1.1.1
 github.com/boltdb/bolt v1.3.1
-github.com/containers/storage v1.12.1
+github.com/containers/storage copy-locks https://github.com/vrothberg/storage
 github.com/docker/distribution 5f6282db7d65e6d72ad7c2cc66310724a57be716
 github.com/docker/docker 54dddadc7d5d89fe0be88f76979f6f6ab0dede83
 github.com/docker/docker-credential-helpers v0.6.1