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

raw json for docker save #6571

Merged
merged 4 commits into from Jun 20, 2014
Merged

raw json for docker save #6571

merged 4 commits into from Jun 20, 2014

Conversation

vbatts
Copy link
Contributor

@vbatts vbatts commented Jun 20, 2014

this PR includes #6461
Fix #6455
Fix #6340
Close #6385
Close #6461

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
func (img *Image) JsonData() ([]byte, error) {
root, err := img.root()
if err != nil {
return nil, fmt.Errorf("Failed to get root for image %s: %s", image.ID, err)
Copy link
Contributor

Choose a reason for hiding this comment

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

@vbatts s/image/img/g

image/image.go:155: undefined: image
image/image.go:159: undefined: image
image/image.go:163: undefined: image

@vbatts
Copy link
Contributor Author

vbatts commented Jun 20, 2014

@tiborvass fixed

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
@vieux
Copy link
Contributor

vieux commented Jun 20, 2014

LGTM

@crosbymichael
Copy link
Contributor

How many PRs are you two going to make ;) just joking

@vbatts
Copy link
Contributor Author

vbatts commented Jun 20, 2014

@crosbymichael SUCH PR

@unclejack
Copy link
Contributor

LGTM

unclejack added a commit that referenced this pull request Jun 20, 2014
@unclejack unclejack merged commit a5f5d5e into moby:master Jun 20, 2014
@vbatts vbatts deleted the vbatts-raw_json branch August 26, 2014 16:05
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.

docker save: does not preserve the "json" docker load clears DockerVersion
5 participants