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

specs-go: add label to config.go #460

Merged
merged 2 commits into from
Dec 7, 2016
Merged

Conversation

coolljt0725
Copy link
Member

Signed-off-by: Lei Jitang leijitang@huawei.com

follow up #371

@@ -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]struct{} `json:"labels,omitempty"`
Copy link
Contributor

Choose a reason for hiding this comment

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

The spec calls for map[string]string.

And we'll need JSON Schema work too, although that doesn't have to happen in this PR.

Copy link
Member Author

Choose a reason for hiding this comment

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

@wking yes, it's map[string]string.  

And we'll need JSON Schema work too, although that doesn't have to happen in this PR.

working on it

@coolljt0725 coolljt0725 force-pushed the label branch 4 times, most recently from d139900 to a43effe Compare November 17, 2016 06:23
@vbatts
Copy link
Member

vbatts commented Nov 30, 2016

@coolljt0725 rebase please?

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Signed-off-by: Lei Jitang <leijitang@huawei.com>
@coolljt0725
Copy link
Member Author

@vbatts rebased

@vbatts
Copy link
Member

vbatts commented Dec 1, 2016

LGTM

Approved with PullApprove

1 similar comment
@philips
Copy link
Contributor

philips commented Dec 7, 2016

LGTM

Approved with PullApprove

@philips philips merged commit d648ee1 into opencontainers:master Dec 7, 2016
cyphar added a commit to opencontainers/umoci that referenced this pull request Dec 10, 2016
In order to fix a slight goof on the side of upstream (image-spec) we
have to add a patch that includes opencontainers/image-spec#460 (which
was _meant_ to be in v1.0.0-rc3 because the relevant spec change was
included).

Signed-off-by: Aleksa Sarai <asarai@suse.com>
cyphar added a commit to opencontainers/umoci that referenced this pull request Dec 10, 2016
In order to fix a slight goof on the side of upstream (image-spec) we
have to add a patch that includes opencontainers/image-spec#460 (which
was _meant_ to be in v1.0.0-rc3 because the relevant spec change was
included).

Signed-off-by: Aleksa Sarai <asarai@suse.com>
cyphar added a commit to opencontainers/umoci that referenced this pull request Dec 10, 2016
In order to fix a slight goof on the side of upstream (image-spec) we
have to add a patch that includes opencontainers/image-spec#460 (which
was _meant_ to be in v1.0.0-rc3 because the relevant spec change was
included).

Signed-off-by: Aleksa Sarai <asarai@suse.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants