Skip to content
This repository has been archived by the owner on Feb 24, 2020. It is now read-only.

Commit

Permalink
vendor: bump appc/spec to v0.8.11
Browse files Browse the repository at this point in the history
  • Loading branch information
Casey Callendrello committed Sep 19, 2017
1 parent 65d9e1c commit 3fada4c
Show file tree
Hide file tree
Showing 22 changed files with 56 additions and 38 deletions.
4 changes: 2 additions & 2 deletions Documentation/app-container.md
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devel/stage1-implementors-guide.md
Expand Up @@ -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": [
{
Expand Down
6 changes: 3 additions & 3 deletions Documentation/proposals/oci.md
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Documentation/subcommands/cat-manifest.md
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.10",
"acVersion":"0.8.11",
"acKind":"PodManifest"
...
```
Expand Down
2 changes: 1 addition & 1 deletion Documentation/subcommands/image.md
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.10",
"acVersion": "0.8.11",
"acKind": "ImageManifest",
...
```
Expand Down
2 changes: 1 addition & 1 deletion Documentation/subcommands/version.md
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.28.1
appc Version: 0.8.10
appc Version: 0.8.11
Go Version: go1.5.3
Go OS/Arch: linux/amd64
6 changes: 3 additions & 3 deletions glide.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion glide.yaml
Expand Up @@ -20,7 +20,7 @@ import:
subpackages:
- proj2aci
- package: github.com/appc/spec
version: v0.8.10
version: v0.8.11
subpackages:
- ace
- aci
Expand Down
2 changes: 1 addition & 1 deletion stage1/aci/aci-manifest.in
@@ -1,6 +1,6 @@
{
"acKind": "ImageManifest",
"acVersion": "0.8.10",
"acVersion": "0.8.11",
"name": "@RKT_STAGE1_NAME@",
"labels": [
{
Expand Down
2 changes: 1 addition & 1 deletion 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": [
{
Expand Down
6 changes: 3 additions & 3 deletions store/imagestore/store_test.go
Expand Up @@ -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": [
{
Expand All @@ -250,7 +250,7 @@ func TestGetAci(t *testing.T) {
{
`{
"acKind": "ImageManifest",
"acVersion": "0.8.10",
"acVersion": "0.8.11",
"name": "example.com/test02",
"labels": [
{
Expand Down
2 changes: 1 addition & 1 deletion tests/empty-image/manifest
@@ -1,6 +1,6 @@
{
"acKind": "ImageManifest",
"acVersion": "0.8.10",
"acVersion": "0.8.11",
"name": "coreos.com/rkt-empty",
"labels": [
{
Expand Down
2 changes: 1 addition & 1 deletion tests/image/manifest
@@ -1,6 +1,6 @@
{
"acKind": "ImageManifest",
"acVersion": "0.8.10",
"acVersion": "0.8.11",
"name": "coreos.com/rkt-inspect",
"labels": [
{
Expand Down
2 changes: 1 addition & 1 deletion tests/rkt-monitor/build-too-many-apps.sh
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/stub-stage1/manifest
@@ -1,6 +1,6 @@
{
"acKind": "ImageManifest",
"acVersion": "0.8.10",
"acVersion": "0.8.11",
"name": "localhost/rkt-stub-stage1",
"labels": [
{
Expand Down
8 changes: 4 additions & 4 deletions vendor/github.com/appc/spec/ace/image_manifest_main.json.in

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions vendor/github.com/appc/spec/schema/pod.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/appc/spec/schema/types/environment.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 8 additions & 3 deletions vendor/github.com/appc/spec/schema/types/labels.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/appc/spec/schema/version.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 3fada4c

Please sign in to comment.