Permalink
Browse files

hack: vendor opencontainers/image-spec@409e1a5

This includes the removal of Config.{Memory{,Swap},CPUShares}, which is
a long time coming, considering that it never made any sense.

Signed-off-by: Aleksa Sarai <asarai@suse.com>
  • Loading branch information...
1 parent f7eac00 commit 81b70ef7d9d45c6892a92314984b5a036ba5a1e8 @cyphar committed Dec 18, 2016
@@ -1,27 +0,0 @@
-From 6ac650626feb8f806af721c4a024b2d9bb360da5 Mon Sep 17 00:00:00 2001
-From: Lei Jitang <leijitang@huawei.com>
-Date: Thu, 17 Nov 2016 14:04:59 +0800
-Subject: [PATCH 1/2] specs-go: add labels to config.go
-
-Signed-off-by: Lei Jitang <leijitang@huawei.com>
----
- specs-go/v1/config.go | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/specs-go/v1/config.go b/specs-go/v1/config.go
-index d42383622695..894cc6cb70f5 100644
---- a/specs-go/v1/config.go
-+++ b/specs-go/v1/config.go
-@@ -45,6 +45,9 @@ type ImageConfig struct {
-
- // WorkingDir sets the current working directory of the entrypoint process in the container.
- WorkingDir string `json:"WorkingDir,omitempty"`
-+
-+ // Labels contains arbitrary metadata for the container.
-+ Labels map[string]string `json:"labels,omitempty"`
- }
-
- // RootFS describes a layer content addresses
---
-2.11.0
-
View
@@ -27,11 +27,6 @@ patch() {
command patch -d "$VENDOR/$project" -p1 <"$SCRIPTDIR/$patch"
}
-# Backport of opencontainers/image-spec#460. This patch wasn't included in
-# v1.0.0-rc3 even though the change to the specification was, resulting in a
-# mismatch. While upstream figures out a way to fix this, just patch it.
-patch github.com/opencontainers/image-spec imagespec-0001-specs-go-add-labels-to-config.go.patch
-
# This is a patch I wrote for pkg/errors#97. I'm not sure how active the
# project is, so I'm just going to backport it here until I see that there's
# upstream activity.
View
@@ -116,7 +116,7 @@ clone() {
# Update everything.
# TODO: Put this in a vendor.conf file or something like that (to be compatible
# with LK4D4/vndr). This setup is a bit unwieldy.
-clone github.com/opencontainers/image-spec v1.0.0-rc3
+clone github.com/opencontainers/image-spec 409e1a51e86f8cb749576453be8e37742c4ba721 # v1.0.0-rc3+37
clone github.com/opencontainers/runtime-spec v1.0.0-rc2
clone github.com/opencontainers/image-tools 421458f7e467ac86175408693a07da6d29817bf7
clone github.com/opencontainers/runtime-tools b61b44a71dafb8472bbc1e5eb0d68ed9ce8ba6ac
@@ -19,15 +19,6 @@ type ImageConfig struct {
// User defines the username or UID which the process in the container should run as.
User string `json:"User,omitempty"`
- // Memory defines the memory limit.
- Memory int64 `json:"Memory,omitempty"`
-
- // MemorySwap defines the total memory usage limit (memory + swap).
- MemorySwap int64 `json:"MemorySwap,omitempty"`
-
- // CPUShares is the CPU shares (relative weight vs. other containers).
- CPUShares int64 `json:"CpuShares,omitempty"`
-
// ExposedPorts a set of ports to expose from a container running this image.
ExposedPorts map[string]struct{} `json:"ExposedPorts,omitempty"`
@@ -16,6 +16,9 @@ package v1
import "regexp"
+// ImageLayoutVersion is the version of ImageLayout
+const ImageLayoutVersion = "1.0.0"
+
// ImageLayout is the structure in the "oci-layout" file, found in the root
// of an OCI Image-layout directory.
type ImageLayout struct {
@@ -25,7 +25,7 @@ const (
VersionPatch = 0
// VersionDev indicates development branch. Releases will be empty string.
- VersionDev = "-rc3"
+ VersionDev = "-rc3-dev"
)
// Version is the specification version that the package types support.

0 comments on commit 81b70ef

Please sign in to comment.