Skip to content

Fix unmarshalling of Command and Entrypoint#14198

Merged
duglin merged 1 commit intomoby:masterfrom
cpuguy83:14170_fix_entrypoint_as_string
Jun 29, 2015
Merged

Fix unmarshalling of Command and Entrypoint#14198
duglin merged 1 commit intomoby:masterfrom
cpuguy83:14170_fix_entrypoint_as_string

Conversation

@cpuguy83
Copy link
Member

@cpuguy83 cpuguy83 commented Jun 26, 2015

Closes #14170

@cpuguy83 cpuguy83 added this to the 1.7.1 milestone Jun 26, 2015
@cpuguy83 cpuguy83 mentioned this pull request Jun 26, 2015
Closed
@cpuguy83 cpuguy83 force-pushed the 14170_fix_entrypoint_as_string branch 2 times, most recently from 8ebd820 to 0d7b71b Compare June 26, 2015 05:20
@duglin
Copy link
Contributor

duglin commented Jun 26, 2015

@cpuguy83 do you know what broke this?

@cpuguy83
Copy link
Member Author

cpuguy83 commented Jun 26, 2015

engine removal.

@cpuguy83
Copy link
Member Author

cpuguy83 commented Jun 26, 2015

FYI, as is in master, this shows up as a quoted string instead of just a string.

@duglin
Copy link
Contributor

duglin commented Jun 26, 2015

LOL yea I figured, but I was just curious if there was a particular change that caused it (like the 'env' stuff') or just the overall churn of the rewrite. No biggie if you don't know - was just wondering.

duglin
duglin reviewed Jun 26, 2015
View reviewed changes
integration-cli/docker_api_containers_test.go
Copy link
Contributor

@duglin duglin Jun 26, 2015

Choose a reason for hiding this comment

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

Entrypoint is defined as a slice, why are you testing it as just a string? Is this for backwards compat?

Copy link
Member Author

@cpuguy83 cpuguy83 Jun 28, 2015

Choose a reason for hiding this comment

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

Yes, this is specifically what's broken that we are fixing.

@cpuguy83
Copy link
Member Author

cpuguy83 commented Jun 26, 2015

Before it was just using engine.Env. Custom unmarshallimg (and type) was added as part of that. So it hasn't worked at all since then.

@cpuguy83
Copy link
Member Author

cpuguy83 commented Jun 26, 2015

*as part of removing that

@cpuguy83
Fix unmarshalling of Command and Entrypoint
17d6f00 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
@LK4D4
Copy link
Contributor

LK4D4 commented Jun 26, 2015

LGTM

@icecrime
Copy link
Contributor

icecrime commented Jun 26, 2015

LGTM: holding on merge given @duglin has open questions.

@cpuguy83 cpuguy83 force-pushed the 14170_fix_entrypoint_as_string branch from 0d7b71b to 17d6f00 Compare June 28, 2015 19:17
@duglin
Copy link
Contributor

duglin commented Jun 29, 2015

thanks!
LGTM

duglin added a commit that referenced this pull request Jun 29, 2015
@duglin
Merge pull request #14198 from cpuguy83/14170_fix_entrypoint_as_string
40a41ff 
Fix unmarshalling of Command and Entrypoint
@duglin duglin merged commit 40a41ff into moby:master Jun 29, 2015
@cpuguy83 cpuguy83 deleted the 14170_fix_entrypoint_as_string branch June 29, 2015 01:48
@calavera
Copy link
Contributor

calavera commented Jun 29, 2015

cherry picked into 1.7.1

@calavera calavera self-assigned this Jun 29, 2015
This was referenced Jul 1, 2015
Closed
Closed
@thaJeztah thaJeztah mentioned this pull request Jul 1, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@calavera calavera

Labels

status/2-code-review

Projects

None yet

Milestone

1.7.1

Development

Successfully merging this pull request may close these issues.

6 participants

@cpuguy83 @duglin @LK4D4 @icecrime @calavera @GordonTheTurtle