Skip to content

Commit

Permalink
rkt: update all appc/spec references to 0.8.7
Browse files Browse the repository at this point in the history
  • Loading branch information
@lucab
lucab committed Aug 30, 2016
1 parent c31f3fa commit ad9e367
Show file tree
Hide file tree
Showing 21 changed files with 28 additions and 28 deletions.
4 changes: 2 additions & 2 deletions Documentation/app-container.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devel/stage1-implementors-guide.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
{
Expand Down
2 changes: 1 addition & 1 deletion Documentation/subcommands/cat-manifest.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
...
```
Expand Down
2 changes: 1 addition & 1 deletion Documentation/subcommands/image.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
...
```
Expand Down
2 changes: 1 addition & 1 deletion Documentation/subcommands/version.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion pkg/aci/aci.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
2 changes: 1 addition & 1 deletion stage1/aci/aci-manifest.in
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"acKind": "ImageManifest",
"acVersion": "0.8.6",
"acVersion": "0.8.7",
"name": "@RKT_STAGE1_NAME@",
"labels": [
{
Expand Down
2 changes: 1 addition & 1 deletion stage1_fly/aci/aci-manifest.in
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"acKind": "ImageManifest",
"acVersion": "0.8.6",
"acVersion": "0.8.7",
"name": "coreos.com/rkt/stage1-fly",
"labels": [
{
Expand Down
12 changes: 6 additions & 6 deletions store/imagestore/store_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ func TestGetImageManifest(t *testing.T) {

imj := `{
"acKind": "ImageManifest",
"acVersion": "0.8.6",
"acVersion": "0.8.7",
"name": "example.com/test01"
}`

Expand Down Expand Up @@ -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": [
{
Expand All @@ -250,7 +250,7 @@ func TestGetAci(t *testing.T) {
{
`{
"acKind": "ImageManifest",
"acVersion": "0.8.6",
"acVersion": "0.8.7",
"name": "example.com/test02",
"labels": [
{
Expand Down Expand Up @@ -358,7 +358,7 @@ func TestRemoveACI(t *testing.T) {

imj := `{
"acKind": "ImageManifest",
"acVersion": "0.8.6",
"acVersion": "0.8.7",
"name": "example.com/test01"
}`

Expand Down Expand Up @@ -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"
}`

Expand Down
4 changes: 2 additions & 2 deletions store/treestore/tree_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
`
Expand Down Expand Up @@ -202,7 +202,7 @@ func TestTreeStore(t *testing.T) {
imj := `
{
"acKind": "ImageManifest",
"acVersion": "0.8.6",
"acVersion": "0.8.7",
"name": "example.com/test01"
}
`
Expand Down
2 changes: 1 addition & 1 deletion tests/empty-image/manifest
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"acKind": "ImageManifest",
"acVersion": "0.8.6",
"acVersion": "0.8.7",
"name": "coreos.com/rkt-empty",
"labels": [
{
Expand Down
2 changes: 1 addition & 1 deletion tests/image/manifest
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"acKind": "ImageManifest",
"acVersion": "0.8.6",
"acVersion": "0.8.7",
"name": "coreos.com/rkt-inspect",
"labels": [
{
Expand Down
2 changes: 1 addition & 1 deletion tests/rkt-monitor/build-too-many-apps.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/rkt_exec_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion tests/rkt_fetch_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion tests/rkt_image_cat_manifest_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion tests/rkt_image_dependencies_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const (
manifestDepsTemplate = `
{
"acKind" : "ImageManifest",
"acVersion" : "0.8.6",
"acVersion" : "0.8.7",
"dependencies" : [
DEPENDENCIES
],
Expand Down
2 changes: 1 addition & 1 deletion tests/rkt_image_export_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/rkt_image_render_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/rkt_os_arch_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion tests/stub-stage1/manifest
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"acKind": "ImageManifest",
"acVersion": "0.8.6",
"acVersion": "0.8.7",
"name": "localhost/rkt-stub-stage1",
"labels": [
{
Expand Down

0 comments on commit ad9e367

Please sign in to comment.