Skip to content

Commit 0bb57af

Browse files
committed
Bump runtime-spec/image-spec to v1.0.0-rc2
`v1.MediaTypeImageLayer` in latest image-spec has changed, need to be bumped up to the latest version. This commit is only focused on bumping the vendored image-spec and runtime-spec to v1.0.0-rc2. `cobra` and `pflag` doesn't tag releases, so I'm pinning this at our currently-vendored commit. I'm not aware of any reason we can't advance this to a later pflag commit, but haven't done enough research to say for sure. Signed-off-by: Ye Yin <[email protected]>
1 parent 0a1e5dc commit 0bb57af

File tree

14 files changed

+81
-77
lines changed

14 files changed

+81
-77
lines changed

glide.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

glide.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
package: github.com/opencontainers/image-tools
22
import:
33
- package: github.com/opencontainers/image-spec
4-
version: 7e6e2f76d6a11cdcb3f3e334e3f12179a0f37dad
4+
version: v1.0.0-rc2
55
subpackages:
66
- schema
77
- specs-go/v1
88
- package: github.com/opencontainers/runtime-spec
9-
version: ~1.0.0-rc1
9+
version: v1.0.0-rc2
1010
subpackages:
1111
- specs-go
1212
- package: github.com/pkg/errors
1313
version: ~0.7.1
1414
- package: github.com/spf13/cobra
15+
version: 9c28e4bbd74e5c3ed7aacbc552b2cab7cfdfe744
16+
- package: github.com/spf13/pflag
17+
version: 7b17cc4658ef5ca157b986ea5c0b43af7938532b

image/config.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ func (c *config) runtimeSpec(rootfs string) (*specs.Spec, error) {
116116
swap := uint64(c.Config.MemorySwap)
117117
shares := uint64(c.Config.CPUShares)
118118

119+
s.Linux = &specs.Linux{}
119120
s.Linux.Resources = &specs.Resources{
120121
CPU: &specs.CPU{
121122
Shares: &shares,

image/image_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ var (
103103
"layers": [
104104
{
105105
"digest": "<layer_digest>",
106-
"mediaType": "application/vnd.oci.image.layer.tar+gzip",
106+
"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
107107
"size": <layer_size>
108108
}
109109
],

image/manifest_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ func TestUnpackLayer(t *testing.T) {
108108

109109
testManifest := manifest{
110110
Layers: []descriptor{descriptor{
111-
MediaType: "application/vnd.oci.image.layer.tar+gzip",
111+
MediaType: "application/vnd.oci.image.layer.v1.tar+gzip",
112112
Digest: fmt.Sprintf("sha256:%s", fmt.Sprintf("%x", h.Sum(nil))),
113113
}},
114114
}

vendor/github.com/opencontainers/image-spec/schema/fs.go

Lines changed: 34 additions & 34 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/opencontainers/image-spec/specs-go/descriptor.go renamed to vendor/github.com/opencontainers/image-spec/specs-go/v1/descriptor.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/opencontainers/image-spec/specs-go/v1/manifest.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/opencontainers/image-spec/specs-go/v1/manifest_list.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/opencontainers/image-spec/specs-go/v1/mediatype.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)