Skip to content
This repository was archived by the owner on Jan 15, 2026. It is now read-only.

Bump up runtime-spec/image-spec to the latest version #69

Merged
xiekeyang merged 1 commit into from
Nov 17, 2016
Merged

Bump up runtime-spec/image-spec to the latest version #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions glide.lock
View file
Open in desktop

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

7 changes: 5 additions & 2 deletions glide.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
package: github.com/opencontainers/image-tools
import:
- package: github.com/opencontainers/image-spec
version: 7e6e2f76d6a11cdcb3f3e334e3f12179a0f37dad
version: v1.0.0-rc2
subpackages:
- schema
- specs-go/v1
- package: github.com/opencontainers/runtime-spec
version: ~1.0.0-rc1
version: v1.0.0-rc2
subpackages:
- specs-go
- package: github.com/pkg/errors
version: ~0.7.1
- package: github.com/spf13/cobra
version: 9c28e4bbd74e5c3ed7aacbc552b2cab7cfdfe744
- package: github.com/spf13/pflag
version: 7b17cc4658ef5ca157b986ea5c0b43af7938532b
Copy link
Contributor

@wking wking Nov 2, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It doesn't look like pflag tags releases. Is there a particular reason you're pinning here instead of at the current tip (spf13/pflag@5ccb023)? Just because that's the currently-vendored commit? I'm fine with that, but would like a note to that effect in the commit message. Something like:

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. This commit is only focused on bumping the vendored image-spec.

Copy link
Contributor Author

@hustcat hustcat Nov 3, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK,It's fine to add some notes.

Copy link
Contributor

@wking wking Nov 3, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you add a note like this somewhere?

Copy link
Contributor Author

@hustcat hustcat Nov 3, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I add it in comment:
image
Do you mean add this note in git commit message?

Copy link
Contributor

@wking wking Nov 3, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, in Git somewhere, in case we leave GitHub or something ;)

Copy link
Contributor Author

@hustcat hustcat Nov 3, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's a good idea.Updated it:)

1 change: 1 addition & 0 deletions image/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ func (c *config) runtimeSpec(rootfs string) (*specs.Spec, error) {
swap := uint64(c.Config.MemorySwap)
shares := uint64(c.Config.CPUShares)

s.Linux = &specs.Linux{}
s.Linux.Resources = &specs.Resources{
CPU: &specs.CPU{
Shares: &shares,
Expand Down
2 changes: 1 addition & 1 deletion image/image_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ var (
"layers": [
{
"digest": "<layer_digest>",
"mediaType": "application/vnd.oci.image.layer.tar+gzip",
"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
"size": <layer_size>
}
],
Expand Down
4 changes: 2 additions & 2 deletions image/manifest_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ func TestUnpackLayer(t *testing.T) {

testManifest := manifest{
Layers: []descriptor{descriptor{
MediaType: "application/vnd.oci.image.layer.tar+gzip",
MediaType: "application/vnd.oci.image.layer.v1.tar+gzip",
Copy link
Contributor

@wking wking Nov 3, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you're missing another one of these on line 172:

$ git grep -n vnd.oci.image.layer.tar origin/pr/69
origin/pr/69:image/manifest_test.go:172:                        MediaType: "application/vnd.oci.image.layer.tar+gzip",

Copy link
Contributor Author

@hustcat hustcat Nov 3, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, Updated:)

Digest: fmt.Sprintf("sha256:%s", fmt.Sprintf("%x", h.Sum(nil))),
}},
}
Expand Down Expand Up @@ -169,7 +169,7 @@ func TestUnpackLayerRemovePartialyUnpackedFile(t *testing.T) {

testManifest := manifest{
Layers: []descriptor{descriptor{
MediaType: "application/vnd.oci.image.layer.tar+gzip",
MediaType: "application/vnd.oci.image.layer.v1.tar+gzip",
Digest: fmt.Sprintf("sha256:%s", fmt.Sprintf("%x", h.Sum(nil))),
}},
}
Expand Down
68 changes: 34 additions & 34 deletions vendor/github.com/opencontainers/image-spec/schema/fs.go
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion ...tainers/image-spec/specs-go/descriptor.go → ...ners/image-spec/specs-go/v1/descriptor.go
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions vendor/github.com/opencontainers/image-spec/specs-go/v1/manifest.go
View file
Open in desktop

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/opencontainers/image-spec/specs-go/v1/manifest_list.go
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions vendor/github.com/opencontainers/image-spec/specs-go/v1/mediatype.go
View file
Open in desktop

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

6 changes: 3 additions & 3 deletions vendor/github.com/opencontainers/image-spec/specs-go/version.go
View file
Open in desktop

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

44 changes: 22 additions & 22 deletions vendor/github.com/opencontainers/runtime-spec/specs-go/config.go
View file
Open in desktop

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/opencontainers/runtime-spec/specs-go/state.go
View file
Open in desktop

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/opencontainers/runtime-spec/specs-go/version.go
View file
Open in desktop

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