Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies to work with new layer media type #56

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package: github.com/opencontainers/image-tools
import:
- package: github.com/opencontainers/image-spec
version: 7e6e2f76d6a11cdcb3f3e334e3f12179a0f37dad
version: 7a6820ed62065744e9142ec93da4b37cc86fed5a
subpackages:
- schema
- specs-go/v1
Expand Down
1 change: 1 addition & 0 deletions image/config.go
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 = new(specs.Linux)
s.Linux.Resources = &specs.Resources{
CPU: &specs.CPU{
Shares: &shares,
Expand Down
2 changes: 1 addition & 1 deletion image/image_test.go
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
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",
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
128 changes: 64 additions & 64 deletions vendor/github.com/opencontainers/image-spec/schema/fs.go

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

38 changes: 19 additions & 19 deletions vendor/github.com/opencontainers/image-spec/specs-go/v1/config.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.

21 changes: 21 additions & 0 deletions vendor/github.com/opencontainers/image-spec/specs-go/v1/layout.go

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

Loading