Merge pull request #107 from q384566678/update-r4

vendor/:update
opencontainers · Feb 7, 2017 · d7e27f1 · d7e27f1
2 parents 15a8732 + ff477b3
commit d7e27f1
Show file tree

Hide file tree

Showing 23 changed files with 1,359 additions and 205 deletions.
diff --git a/.tool/lint b/.tool/lint
@@ -21,5 +21,5 @@ for d in $(find . -type d -not -iwholename '*.git*' -a -not -iname '.tool' -a -n
 		--disable=gas \
 		--cyclo-over=35 \
 		--tests \
-		--deadline=10s "${d}"
+		--deadline=20s "${d}"
 done
diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -1,12 +1,12 @@
 package: github.com/opencontainers/image-tools
 import:
 - package: github.com/opencontainers/image-spec
-  version: v1.0.0-rc3
+  version: v1.0.0-rc4
   subpackages:
   - schema
   - specs-go/v1
 - package: github.com/opencontainers/runtime-spec
-  version: v1.0.0-rc2
+  version: v1.0.0-rc3
   subpackages:
   - specs-go
 - package: github.com/pkg/errors

diff --git a/image/image_test.go b/image/image_test.go
@@ -104,11 +104,10 @@ var (
     "layers": [
         {
             "digest": "<layer_digest>",
-            "mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
+            "mediaType": "application/vnd.oci.image.layer.v1.tar",
             "size": <layer_size>
         }
     ],
-    "mediaType": "application/vnd.oci.image.manifest.v1+json",
     "schemaVersion": 2
 }
  `

diff --git a/vendor/github.com/opencontainers/go-digest/LICENSE.code b/vendor/github.com/opencontainers/go-digest/LICENSE.code