Merge pull request #102 from q384566678/config-delet

Delete does not exist properties
opencontainers · Jan 20, 2017 · 6e09f9d · 6e09f9d
2 parents 848adc5 + 877e55e
commit 6e09f9d
Show file tree

Hide file tree

Showing 13 changed files with 155 additions and 93 deletions.
diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -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

diff --git a/image/config.go b/image/config.go
@@ -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(

diff --git a/image/image_test.go b/image/image_test.go
@@ -43,9 +43,6 @@ const (
     "os": "linux",
     "config": {
         "User": "alice",
-        "Memory": 2048,
-        "MemorySwap": 4096,
-        "CpuShares": 8,
         "ExposedPorts": {
             "8080/tcp": {}
         },

diff --git a/vendor/github.com/opencontainers/image-spec/schema/fs.go b/vendor/github.com/opencontainers/image-spec/schema/fs.go
diff --git a/vendor/github.com/opencontainers/image-spec/schema/validator.go b/vendor/github.com/opencontainers/image-spec/schema/validator.go
diff --git a/vendor/github.com/opencontainers/image-spec/specs-go/v1/config.go b/vendor/github.com/opencontainers/image-spec/specs-go/v1/config.go
diff --git a/vendor/github.com/opencontainers/image-spec/specs-go/v1/descriptor.go b/vendor/github.com/opencontainers/image-spec/specs-go/v1/descriptor.go