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.

Sign up for GitHub

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

Delete does not exist properties #102

Merged
merged 1 commit into from
Jan 20, 2017
Merged

Delete does not exist properties #102

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
8 changes: 4 additions & 4 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.

2 changes: 1 addition & 1 deletion glide.yaml
View file
Open in desktop
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: v1.0.0-rc2
version: v1.0.0-rc3
subpackages:
- schema
- specs-go/v1
Expand Down
15 changes: 0 additions & 15 deletions image/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,22 +109,7 @@ func (c *config) runtimeSpec(rootfs string) (*specs.Spec, error) {
s.Platform.OS = c.OS
s.Platform.Arch = c.Architecture

mem := uint64(c.Config.Memory)
swap := uint64(c.Config.MemorySwap)
shares := uint64(c.Config.CPUShares)

s.Linux = &specs.Linux{}
s.Linux.Resources = &specs.Resources{
CPU: &specs.CPU{
Shares: &shares,
},

Memory: &specs.Memory{
Limit: &mem,
Reservation: &mem,
Swap: &swap,
},
}

for vol := range c.Config.Volumes {
s.Mounts = append(
Expand Down
3 changes: 0 additions & 3 deletions image/image_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,6 @@ const (
"os": "linux",
"config": {
"User": "alice",
"Memory": 2048,
"MemorySwap": 4096,
"CpuShares": 8,
"ExposedPorts": {
"8080/tcp": {}
},
Expand Down
99 changes: 52 additions & 47 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.

44 changes: 44 additions & 0 deletions vendor/github.com/opencontainers/image-spec/schema/validator.go
View file
Open in desktop

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
View file
Open in desktop

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

3 changes: 3 additions & 0 deletions vendor/github.com/opencontainers/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.

Loading