8000 Make .dockercfg with json.MarshallIndent by cpuguy83 · Pull Request #10143 · moby/moby · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Make .dockercfg with json.MarshallIndent #10143

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Jan 17, 2015
Merged

Make .dockercfg with json.MarshallIndent #10143

merged 1 commit into from
Jan 17, 2015

Conversation

cpuguy83
Copy link
Member

Fixes #10129
Makes the .dockercfg more human parsable.

Also cleaned up the (technically) racey login test.

@cpuguy83 cpuguy83 force-pushed the 10129_marshal-indent_dockercfg branch from 3018164 to 7c51091 Compare January 16, 2015 15:03
LK4D4
LK4D4 reviewed Jan 16, 2015
View reviewed changes
integration-cli/docker_cli_login_test.go
// copy the bytes into the commands stdin along with a new line
go io.Copy(in, buf)
io.WriteString(in, "buffer test string \n")
Copy link
Contributor

Choose a reason for hiding this comment

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

I wonder if this can be just cmd.Stdin = bytes.NewBufferString("buffer test string \n") and Run

Copy link
Member Author

Choose a reason for hiding this comment

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

Yup! Updated.

Copy link
Contributor

Choose a reason for hiding this comment

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

even better 💃

@cpuguy83 cpuguy83 force-pushed the 10129_marshal-indent_dockercfg branch 3 times, most recently from eba1626 to 58d1b1d Compare January 16, 2015 22:28
@LK4D4
Copy link
Contributor
LK4D4 commented Jan 17, 2015

Drone is dead, lol

@jessfraz
Copy link
Contributor

you have a bad rebase or something?

@jessfraz
Copy link
Contributor

or this new change doesnt work and the first original change did...? idk

@LK4D4
Copy link
Contributor
LK4D4 commented Jan 17, 2015

@jfrazelle Something with drone, no?

@LK4D4
Copy link
Contributor
LK4D4 commented Jan 17, 2015

heh, other pr works :)

@cpuguy83
Copy link
Member Author

Works locally.

@jessfraz
Copy link
Contributor

I literally have no idea other PRs are working

@jessfraz
Copy link
Contributor

can you try rebasing or something? it's almost like you have michaels libcontainer PR patch which actually is a bug i can reproduce locally

@jessfraz
Copy link
Contributor

ok im trying one more time

@cpuguy83 cpuguy83 force-pushed the 10129_marshal-indent_dockercfg branch from 58d1b1d to f1524a2 Compare January 17, 2015 00:49
@jessfraz
Copy link
Contributor

This is NOT drone. It does NOT work for me locally.

@jessfraz
Copy link
Contributor

do not fret however we think/know this is part of the weird go binary size bug we are looking into ;) keep the faith and have a good weekend

@jessfraz
Copy link
Contributor

if you rebase on master it will be fixed, sorry!

@cpuguy83
Make .dockercfg with json.MarshallIndent
b8f7526 
Fixes moby#10129
Makes the .dockercfg more human parsable.

Also cleaned up the (technically) racey login test.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
@cpuguy83 cpuguy83 force-pushed the 10129_marshal-indent_dockercfg branch from f1524a2 to b8f7526 Compare January 17, 2015 12:06
@cpuguy83
Copy link
Member Author

Rebased

@LK4D4
Copy link
Contributor
LK4D4 commented Jan 17, 2015

LGTM

1 similar comment
@jessfraz
Copy link
Contributor

LGTM

jessfraz pushed a commit that referenced this pull request Jan 17, 2015
Merge pull request #10143 from cpuguy83/10129_marshal-indent_dockercfg
467b7c8 
Make .dockercfg with json.MarshallIndent
@jessfraz jessfraz merged commit 467b7c8 into moby:master Jan 17, 2015
@SvenDowideit SvenDowideit mentioned this pull request Jan 27, 2015
Merged
@cpuguy83 cpuguy83 deleted the 10129_marshal-indent_dockercfg branch September 20, 2017 16:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

add newline for each login item in .dockercfg
3 participants
@cpuguy83 @LK4D4 @jessfraz
0