Merge pull request rkt#3143 from lucab/to-upstream/bump-appc-spec

vendor: update appc/spec to 0.8.7

Documentation/app-container.md

@@ -33,8 +33,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.6/ace-validator-main.aci \
-	https://github.com/appc/spec/releases/download/v0.8.6/ace-validator-sidekick.aci
+	https://github.com/appc/spec/releases/download/v0.8.7/ace-validator-main.aci \
+	https://github.com/appc/spec/releases/download/v0.8.7/ace-validator-sidekick.aci
 ```
 
 [appc-repo]: https://github.com/appc/spec/

Documentation/devel/stage1-implementors-guide.md

@@ -143,7 +143,7 @@ The current version of the stage1 interface is 3.
 ```json
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.6",
+    "acVersion": "0.8.7",
     "name": "foo.com/rkt/stage1",
     "labels": [
         {

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.6",
+  "acVersion":"0.8.7",
   "acKind":"PodManifest"
 ...
 ```

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.6",
+  "acVersion": "0.8.7",
   "acKind": "ImageManifest",
 ...
 ```

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.13.0
-appc Version: 0.8.6
+appc Version: 0.8.7
 Go Version: go1.5.3
 Go OS/Arch: linux/amd64

glide.yaml

@@ -20,7 +20,7 @@ import:
   subpackages:
   - proj2aci
 - package: github.com/appc/spec
-  version: v0.8.6
+  version: v0.8.7
   subpackages:
   - ace
   - aci

pkg/aci/aci.go

@@ -107,7 +107,7 @@ func (aw *imageArchiveWriter) Close() error {
 // NewBasicACI creates a new ACI in the given directory with the given name.
 // Used for testing.
 func NewBasicACI(dir string, name string) (*os.File, error) {
-	manifest := fmt.Sprintf(`{"acKind":"ImageManifest","acVersion":"0.8.6","name":"%s"}`, name)
+	manifest := fmt.Sprintf(`{"acKind":"ImageManifest","acVersion":"0.8.7","name":"%s"}`, name)
 	return NewACI(dir, manifest, nil)
 }
 

stage1/aci/aci-manifest.in

@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.6",
+    "acVersion": "0.8.7",
     "name": "@RKT_STAGE1_NAME@",
     "labels": [
         {

stage1_fly/aci/aci-manifest.in

@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.6",
+    "acVersion": "0.8.7",
     "name": "coreos.com/rkt/stage1-fly",
     "labels": [
         {

store/imagestore/store_test.go

@@ -163,7 +163,7 @@ func TestGetImageManifest(t *testing.T) {
 
 	imj := `{
 			"acKind": "ImageManifest",
-			"acVersion": "0.8.6",
+			"acVersion": "0.8.7",
 			"name": "example.com/test01"
 		}`
 
@@ -228,15 +228,15 @@ func TestGetAci(t *testing.T) {
 				{
 					`{
 						"acKind": "ImageManifest",
-						"acVersion": "0.8.6",
+						"acVersion": "0.8.7",
 						"name": "example.com/test01"
 					}`,
 					false,
 				},
 				{
 					`{
 						"acKind": "ImageManifest",
-						"acVersion": "0.8.6",
+						"acVersion": "0.8.7",
 						"name": "example.com/test02",
 						"labels": [
 							{
@@ -250,7 +250,7 @@ func TestGetAci(t *testing.T) {
 				{
 					`{
 						"acKind": "ImageManifest",
-						"acVersion": "0.8.6",
+						"acVersion": "0.8.7",
 						"name": "example.com/test02",
 						"labels": [
 							{
@@ -358,7 +358,7 @@ func TestRemoveACI(t *testing.T) {
 
 	imj := `{
                     "acKind": "ImageManifest",
-                    "acVersion": "0.8.6",
+                    "acVersion": "0.8.7",
                     "name": "example.com/test01"
                 }`
 
@@ -403,7 +403,7 @@ func TestRemoveACI(t *testing.T) {
 	// Simulate error removing from the
 	imj = `{
                    "acKind": "ImageManifest",
-                   "acVersion": "0.8.6",
+                   "acVersion": "0.8.7",
                    "name": "example.com/test01"
                }`
 

store/treestore/tree_test.go

@@ -34,7 +34,7 @@ func testStoreWriteACI(dir string, s *imagestore.Store) (string, error) {
 	imj := `
 		{
 		    "acKind": "ImageManifest",
-		    "acVersion": "0.8.6",
+		    "acVersion": "0.8.7",
 		    "name": "example.com/test01"
 		}
 	`
@@ -202,7 +202,7 @@ func TestTreeStore(t *testing.T) {
 	imj := `
 		{
 		    "acKind": "ImageManifest",
-		    "acVersion": "0.8.6",
+		    "acVersion": "0.8.7",
 		    "name": "example.com/test01"
 		}
 	`

tests/empty-image/manifest

@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.6",
+    "acVersion": "0.8.7",
     "name": "coreos.com/rkt-empty",
     "labels": [
         {

tests/image/manifest

@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.6",
+    "acVersion": "0.8.7",
     "name": "coreos.com/rkt-inspect",
     "labels": [
         {

tests/rkt-monitor/build-too-many-apps.sh

@@ -45,7 +45,7 @@ OUTPUT=${PWD}/too-many-apps.podmanifest
 
 cat <<EOF >${OUTPUT}
 {
-    "acVersion": "0.8.6",
+    "acVersion": "0.8.7",
     "acKind": "PodManifest",
     "apps": [
 EOF

tests/rkt_exec_test.go

@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.8.6","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.13.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
+	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.13.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
 )
 
 func TestRunOverrideExec(t *testing.T) {

tests/rkt_fetch_test.go

@@ -536,7 +536,7 @@ func TestDeferredSignatureDownload(t *testing.T) {
 }
 
 func TestDifferentDiscoveryLabels(t *testing.T) {
-	manifestTemplate := `{"acKind":"ImageManifest","acVersion":"0.8.6","name":"IMG_NAME","labels":[{"name":"version","value":"1.2.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
+	manifestTemplate := `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.2.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
 	emptyImage := getEmptyImagePath()
 	imageName := "localhost/rkt-test-different-discovery-labels-image"
 	manifest := strings.Replace(manifestTemplate, "IMG_NAME", imageName, -1)

tests/rkt_image_cat_manifest_test.go

@@ -29,7 +29,7 @@ import (
 const (
 
 	// The expected image manifest of the 'rkt-inspect-image-cat-manifest.aci'.
-	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.6","name":"IMG_NAME","labels":[{"name":"version","value":"1.13.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.13.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageCatManifest tests 'rkt image cat-manifest', it will:

tests/rkt_image_dependencies_test.go

@@ -33,7 +33,7 @@ const (
 	manifestDepsTemplate = `
 {
    "acKind" : "ImageManifest",
-   "acVersion" : "0.8.6",
+   "acVersion" : "0.8.7",
    "dependencies" : [
       DEPENDENCIES
    ],

tests/rkt_image_export_test.go

@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.6","name":"IMG_NAME","labels":[{"name":"version","value":"1.13.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.13.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageExport tests 'rkt image export', it will import some existing

tests/rkt_image_render_test.go

@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.6","name":"IMG_NAME","labels":[{"name":"version","value":"1.13.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.13.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageRender tests 'rkt image render', it will import some existing empty

tests/rkt_os_arch_test.go

@@ -27,7 +27,7 @@ import (
 )
 
 const (
-	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.6","name":"IMG_NAME","labels":[{"name":"version","value":"1.13.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
+	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.13.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
 )
 
 type osArchTest struct {

tests/stub-stage1/manifest

@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.6",
+    "acVersion": "0.8.7",
     "name": "localhost/rkt-stub-stage1",
     "labels": [
         {