Merge pull request #3803 from squeed/bump-appc

vendor: bump appc/spec to v0.8.11
rkt · Sep 20, 2017 · 9fb7edb · 9fb7edb
2 parents 65d9e1c + a0fc3b8
commit 9fb7edb
Show file tree

Hide file tree

Showing 24 changed files with 70 additions and 38 deletions.
diff --git a/Documentation/app-container.md b/Documentation/app-container.md
@@ -35,8 +35,8 @@ To validate that `rkt` successfully implements the ACE part of the spec, use the
 # rkt --insecure-options=image run \
 	--mds-register \
 	--volume=database,kind=host,source=/tmp \
-	https://github.com/appc/spec/releases/download/v0.8.10/ace-validator-main.aci \
-	https://github.com/appc/spec/releases/download/v0.8.10/ace-validator-sidekick.aci
+	https://github.com/appc/spec/releases/download/v0.8.11/ace-validator-main.aci \
+	https://github.com/appc/spec/releases/download/v0.8.11/ace-validator-sidekick.aci
 ```
 
 [acbuild]: https://github.com/containers/build

diff --git a/Documentation/devel/stage1-implementors-guide.md b/Documentation/devel/stage1-implementors-guide.md
@@ -253,7 +253,7 @@ If the annotation is not present, rkt assumes the version is 1.
 ```json
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.10",
+    "acVersion": "0.8.11",
     "name": "foo.com/rkt/stage1",
     "labels": [
         {

diff --git a/Documentation/proposals/oci.md b/Documentation/proposals/oci.md
@@ -130,9 +130,9 @@ Backwards compatibility: Currently the biggest concern identified is backwards c
 [docker2aci]: https://github.com/appc/docker2aci
 [oci-runtime]: https://github.com/opencontainers/runtime-spec
 
-[aci]: https://github.com/appc/spec/blob/v0.8.10/spec/aci.md#app-container-image
-[ace-fs]: https://github.com/appc/spec/blob/v0.8.10/spec/ace.md#filesystem-setup
-[appc-image-id-type]: https://github.com/appc/spec/blob/v0.8.10/spec/types.md#image-id-type
+[aci]: https://github.com/appc/spec/blob/v0.8.11/spec/aci.md#app-container-image
+[ace-fs]: https://github.com/appc/spec/blob/v0.8.11/spec/ace.md#filesystem-setup
+[appc-image-id-type]: https://github.com/appc/spec/blob/v0.8.11/spec/types.md#image-id-type
 
 [oci]: https://github.com/opencontainers/image-spec
 [oci-manifest]: https://github.com/opencontainers/image-spec/blob/v1.0.0-rc2/manifest.md#image-manifest

diff --git a/Documentation/subcommands/cat-manifest.md b/Documentation/subcommands/cat-manifest.md
@@ -5,7 +5,7 @@ For debugging or inspection you may want to extract the PodManifest to stdout.
 ```
 # rkt cat-manifest UUID
 {
-  "acVersion":"0.8.10",
+  "acVersion":"0.8.11",
   "acKind":"PodManifest"
 ...
 ```

diff --git a/Documentation/subcommands/image.md b/Documentation/subcommands/image.md
@@ -7,7 +7,7 @@ For debugging or inspection you may want to extract an ACI manifest to stdout.
 ```
 # rkt image cat-manifest coreos.com/etcd
 {
-  "acVersion": "0.8.10",
+  "acVersion": "0.8.11",
   "acKind": "ImageManifest",
 ...
 ```

diff --git a/Documentation/subcommands/version.md b/Documentation/subcommands/version.md
@@ -7,6 +7,6 @@ This command prints the rkt version, the appc version rkt is built against, and
 ```
 $ rkt version
 rkt Version: 1.28.1
-appc Version: 0.8.10
+appc Version: 0.8.11
 Go Version: go1.5.3
 Go OS/Arch: linux/amd64
diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -20,7 +20,7 @@ import:
   subpackages:
   - proj2aci
 - package: github.com/appc/spec
-  version: v0.8.10
+  version: v0.8.11
   subpackages:
   - ace
   - aci

diff --git a/stage1/aci/aci-manifest.in b/stage1/aci/aci-manifest.in
@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.10",
+    "acVersion": "0.8.11",
     "name": "@RKT_STAGE1_NAME@",
     "labels": [
         {

diff --git a/stage1_fly/aci/aci-manifest.in b/stage1_fly/aci/aci-manifest.in
@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.10",
+    "acVersion": "0.8.11",
     "name": "coreos.com/rkt/stage1-fly",
     "labels": [
         {

diff --git a/store/imagestore/store_test.go b/store/imagestore/store_test.go
@@ -228,15 +228,15 @@ func TestGetAci(t *testing.T) {
 				{
 					`{
 						"acKind": "ImageManifest",
-						"acVersion": "0.8.10",
+						"acVersion": "0.8.11",
 						"name": "example.com/test01"
 					}`,
 					false,
 				},
 				{
 					`{
 						"acKind": "ImageManifest",
-						"acVersion": "0.8.10",
+						"acVersion": "0.8.11",
 						"name": "example.com/test02",
 						"labels": [
 							{
@@ -250,7 +250,7 @@ func TestGetAci(t *testing.T) {
 				{
 					`{
 						"acKind": "ImageManifest",
-						"acVersion": "0.8.10",
+						"acVersion": "0.8.11",
 						"name": "example.com/test02",
 						"labels": [
 							{

diff --git a/tests/empty-image/manifest b/tests/empty-image/manifest
@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.10",
+    "acVersion": "0.8.11",
     "name": "coreos.com/rkt-empty",
     "labels": [
         {

diff --git a/tests/image/manifest b/tests/image/manifest
@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.10",
+    "acVersion": "0.8.11",
     "name": "coreos.com/rkt-inspect",
     "labels": [
         {

diff --git a/tests/rkt-monitor/build-too-many-apps.sh b/tests/rkt-monitor/build-too-many-apps.sh
@@ -45,7 +45,7 @@ OUTPUT=${PWD}/too-many-apps.podmanifest
 
 cat <<EOF >${OUTPUT}
 {
-    "acVersion": "0.8.10",
+    "acVersion": "0.8.11",
     "acKind": "PodManifest",
     "apps": [
 EOF

diff --git a/tests/rkt_volume_mount_generic_test.go b/tests/rkt_volume_mount_generic_test.go
@@ -45,6 +45,7 @@ func TestVolumeMount(t *testing.T) {
 				),
 				nil,
 				innerFileContent,
+				false,
 			},
 		},
 	}).Execute(t)

diff --git a/tests/rkt_volume_mount_test.go b/tests/rkt_volume_mount_test.go
@@ -103,6 +103,7 @@ type volumeMountTestCase struct {
 	cmdArgs        string
 	podManifest    *schema.PodManifest
 	expectedResult string
+	skipPrepared   bool
 }
 
 var (
@@ -121,6 +122,7 @@ var (
 			),
 			nil,
 			innerFileContent,
+			false,
 		},
 		{
 			"CLI: recursive read-only mount write file must fail",
@@ -136,6 +138,7 @@ var (
 			),
 			nil,
 			"read-only file system",
+			false,
 		},
 	}
 
@@ -154,6 +157,7 @@ var (
 			),
 			nil,
 			outerFileContent,
+			false,
 		},
 		{
 			"CLI: read-only non-recursive write file must fail",
@@ -169,6 +173,7 @@ var (
 			),
 			nil,
 			"read-only file system",
+			false,
 		},
 	}
 
@@ -203,6 +208,7 @@ var (
 				},
 			},
 			innerFileContent,
+			false,
 		},
 		{
 			"Write of nested file for recursive/read-only mount must fail",
@@ -235,6 +241,7 @@ var (
 				},
 			},
 			"read-only file system",
+			false,
 		},
 	}
 
@@ -271,6 +278,7 @@ var (
 				},
 			},
 			"host:foo",
+			false,
 		},
 	}
 
@@ -305,6 +313,7 @@ var (
 				},
 			},
 			outerFileContent,
+			false,
 		},
 	}
 
@@ -320,6 +329,7 @@ var (
 			),
 			nil,
 			"duplicate volume name",
+			true,
 		},
 	}
 )
@@ -383,6 +393,9 @@ func NewTestVolumeMount(volumeMountTestCases [][]volumeMountTestCase) testutils.
 				verifyHostFile(t, volDir, "file", i, tt.expectedResult)
 
 				// 2. Test 'rkt prepare' + 'rkt run-prepared'.
+				if tt.skipPrepared {
+					continue
+				}
 				prepareCmd := fmt.Sprintf("%s prepare", ctx.Cmd())
 				if manifestFile != "" {
 					prepareCmd += fmt.Sprintf(" --pod-manifest=%s", manifestFile)

diff --git a/tests/stub-stage1/manifest b/tests/stub-stage1/manifest
@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.10",
+    "acVersion": "0.8.11",
     "name": "localhost/rkt-stub-stage1",
     "labels": [
         {

diff --git a/vendor/github.com/appc/spec/ace/image_manifest_main.json.in b/vendor/github.com/appc/spec/ace/image_manifest_main.json.in
diff --git a/vendor/github.com/appc/spec/ace/image_manifest_sidekick.json.in b/vendor/github.com/appc/spec/ace/image_manifest_sidekick.json.in
diff --git a/vendor/github.com/appc/spec/schema/pod.go b/vendor/github.com/appc/spec/schema/pod.go
diff --git a/vendor/github.com/appc/spec/schema/types/environment.go b/vendor/github.com/appc/spec/schema/types/environment.go
diff --git a/vendor/github.com/appc/spec/schema/types/isolator_linux_specific.go b/vendor/github.com/appc/spec/schema/types/isolator_linux_specific.go
diff --git a/vendor/github.com/appc/spec/schema/types/labels.go b/vendor/github.com/appc/spec/schema/types/labels.go
diff --git a/vendor/github.com/appc/spec/schema/version.go b/vendor/github.com/appc/spec/schema/version.go