diff --git a/Documentation/app-container.md b/Documentation/app-container.md index cb54478628..b50a5532db 100644 --- a/Documentation/app-container.md +++ b/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/ diff --git a/Documentation/devel/stage1-implementors-guide.md b/Documentation/devel/stage1-implementors-guide.md index 5a66cb4803..d6838519ba 100644 --- a/Documentation/devel/stage1-implementors-guide.md +++ b/Documentation/devel/stage1-implementors-guide.md @@ -137,7 +137,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": [ { diff --git a/Documentation/subcommands/cat-manifest.md b/Documentation/subcommands/cat-manifest.md index c39d6253dc..733aa0573b 100644 --- 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.6", + "acVersion":"0.8.7", "acKind":"PodManifest" ... ``` diff --git a/Documentation/subcommands/image.md b/Documentation/subcommands/image.md index c83da83117..1bb50d404a 100644 --- 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.6", + "acVersion": "0.8.7", "acKind": "ImageManifest", ... ``` diff --git a/Documentation/subcommands/version.md b/Documentation/subcommands/version.md index 722ec5a24b..e6a2af9d16 100644 --- 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.13.0 -appc Version: 0.8.6 +appc Version: 0.8.7 Go Version: go1.5.3 Go OS/Arch: linux/amd64 diff --git a/pkg/aci/aci.go b/pkg/aci/aci.go index f760fa615b..aa672f358a 100644 --- a/pkg/aci/aci.go +++ b/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) } diff --git a/stage1/aci/aci-manifest.in b/stage1/aci/aci-manifest.in index c3e2753e2c..554009f39c 100644 --- a/stage1/aci/aci-manifest.in +++ b/stage1/aci/aci-manifest.in @@ -1,6 +1,6 @@ { "acKind": "ImageManifest", - "acVersion": "0.8.6", + "acVersion": "0.8.7", "name": "@RKT_STAGE1_NAME@", "labels": [ { diff --git a/stage1_fly/aci/aci-manifest.in b/stage1_fly/aci/aci-manifest.in index 69cd279b3a..49c67d5350 100644 --- a/stage1_fly/aci/aci-manifest.in +++ b/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": [ { diff --git a/store/imagestore/store_test.go b/store/imagestore/store_test.go index 4243e4e9b9..13f0619cc2 100644 --- a/store/imagestore/store_test.go +++ b/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,7 +228,7 @@ func TestGetAci(t *testing.T) { { `{ "acKind": "ImageManifest", - "acVersion": "0.8.6", + "acVersion": "0.8.7", "name": "example.com/test01" }`, false, @@ -236,7 +236,7 @@ func TestGetAci(t *testing.T) { { `{ "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" }` diff --git a/store/treestore/tree_test.go b/store/treestore/tree_test.go index 49b81c1c9c..a471cf8309 100644 --- a/store/treestore/tree_test.go +++ b/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" } ` diff --git a/tests/empty-image/manifest b/tests/empty-image/manifest index b489d6a443..ab9557a99d 100644 --- a/tests/empty-image/manifest +++ b/tests/empty-image/manifest @@ -1,6 +1,6 @@ { "acKind": "ImageManifest", - "acVersion": "0.8.6", + "acVersion": "0.8.7", "name": "coreos.com/rkt-empty", "labels": [ { diff --git a/tests/image/manifest b/tests/image/manifest index 421d684f86..323039891b 100644 --- a/tests/image/manifest +++ b/tests/image/manifest @@ -1,6 +1,6 @@ { "acKind": "ImageManifest", - "acVersion": "0.8.6", + "acVersion": "0.8.7", "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 index 36affa97f6..76e870fdce 100755 --- 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 <${OUTPUT} { - "acVersion": "0.8.6", + "acVersion": "0.8.7", "acKind": "PodManifest", "apps": [ EOF diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go index 2dec988556..ef4bc00de7 100644 --- a/tests/rkt_exec_test.go +++ b/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) { diff --git a/tests/rkt_fetch_test.go b/tests/rkt_fetch_test.go index 0fb60487a6..a82b4bf1a9 100644 --- a/tests/rkt_fetch_test.go +++ b/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) diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go index 3dcfb74d7a..415cdfcd34 100644 --- a/tests/rkt_image_cat_manifest_test.go +++ b/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: diff --git a/tests/rkt_image_dependencies_test.go b/tests/rkt_image_dependencies_test.go index 8375fa1543..d7ed8d269b 100644 --- a/tests/rkt_image_dependencies_test.go +++ b/tests/rkt_image_dependencies_test.go @@ -33,7 +33,7 @@ const ( manifestDepsTemplate = ` { "acKind" : "ImageManifest", - "acVersion" : "0.8.6", + "acVersion" : "0.8.7", "dependencies" : [ DEPENDENCIES ], diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go index c05eb34115..73869552ed 100644 --- a/tests/rkt_image_export_test.go +++ b/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 diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go index bbbd456ac1..4b15652ada 100644 --- a/tests/rkt_image_render_test.go +++ b/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 diff --git a/tests/rkt_os_arch_test.go b/tests/rkt_os_arch_test.go index bc1cc88076..46e4286f7c 100644 --- a/tests/rkt_os_arch_test.go +++ b/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 { diff --git a/tests/stub-stage1/manifest b/tests/stub-stage1/manifest index d405570161..c849b8cc47 100644 --- a/tests/stub-stage1/manifest +++ b/tests/stub-stage1/manifest @@ -1,6 +1,6 @@ { "acKind": "ImageManifest", - "acVersion": "0.8.6", + "acVersion": "0.8.7", "name": "localhost/rkt-stub-stage1", "labels": [ {