8000 [19.03 backport] Use certs.d from XDG_CONFIG_HOME when in rootless mode (fixes #40236) by AkihiroSuda · Pull Request #40461 · moby/moby · GitHub
[go: up one dir, main page]
Skip to content

[19.03 backport] Use certs.d from XDG_CONFIG_HOME when in rootless mode (fixes #40236) #40461

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
Feb 28, 2020
Merged

[19.03 backport] Use certs.d from XDG_CONFIG_HOME when in rootless mode (fixes #40236) #40461

merged 1 commit into from
Feb 28, 2020

Conversation

AkihiroSuda
Copy link
Member

cherrypick #40243

@AkihiroSuda AkihiroSuda added the area/rootless Rootless Mode label Feb 6, 2020
@thaJeztah thaJeztah modified the milestones: 19.03.6, 19.03.7 Feb 6, 2020
thaJeztah
thaJeztah requested changes Feb 25, 2020
View reviewed changes
Copy link
Member
@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

Sorry, I realize this is a cherry-pick of something that's already on master, but have some questions reading over it again 🤗

@thaJeztah thaJeztah mentioned this pull request Feb 25, 2020
Merged
@dsseng @AkihiroSuda
Use certs.d
a2d887b 
 from XDG_CONFIG_HOME
 when in rootless mode

Signed-off-by: Dmitry Sharshakov <d3dx12.xx@gmail.com>
(cherry picked from commit f4fa98f)
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
@AkihiroSuda AkihiroSuda force-pushed the cherrypick-40243-1903 branch from 1921bae to a2d887b Compare February 26, 2020 07:51
thaJeztah
thaJeztah approved these changes Feb 26, 2020
View reviewed changes
Copy link
Member
@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM

@thaJeztah
Copy link
Member

@cpuguy83 @tiborvass PTAL

@thaJeztah
Copy link
Member

Why is swagger failing to build? Let me check if we made a mistake somewhere and didn't update it to use the forked version with fixes.


[2020-02-26T08:16:19.168Z] #15 ERROR: executor failed running [/bin/sh -c set -x 	&& export GOPATH="$(mktemp -d)" 	&& git clone https://github.com/go-swagger/go-swagger.git "$GOPATH/src/github.com/go-swagger/go-swagger" 	&& (cd "$GOPATH/src/github.com/go-swagger/go-swagger" && git checkout -q "$GO_SWAGGER_COMMIT") 	&& go build -o /build/swagger github.com/go-swagger/go-swagger/cmd/swagger 	&& rm -rf "$GOPATH"]: runc did not terminate sucessfully
[2020-02-26T08:16:19.168Z] ------
[2020-02-26T08:16:19.168Z]  > [swagger 1/1] RUN set -x 	&& export GOPATH="$(mktemp -d)" 	&& git clone https://github.com/go-swagger/go-swagger.git "/go/src/github.com/go-swagger/go-swagger" 	&& (cd "/go/src/github.com/go-swagger/go-swagger" && git checkout -q "c28258affb0b6251755d92489ef685af8d4ff3eb") 	&& go build -o /build/swagger github.com/go-swagger/go-swagger/cmd/swagger 	&& rm -rf "/go":
[2020-02-26T08:16:19.168Z] ------

@thaJeztah
Copy link
Member

Hm, nope, that's not it; the 19.03 branch still points to go-swagger/go-swagger@c28258a, which is the non-forked version.

This PR updates the branch to use the fork, but it's not merged yet; #40558

@thaJeztah
Copy link
Member

Triggered CI again 🤷‍♂

cpuguy83
cpuguy83 approved these changes Feb 28, 2020
View reviewed changes
Copy link
Member
@cpuguy83 cpuguy83 left a comment

Choose a reason for hiding this comment

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

LGTM

@cpuguy83 cpuguy83 merged commit 5101ce5 into moby:19.03 Feb 28, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cpuguy83 cpuguy83 cpuguy83 approved these changes

@thaJeztah thaJeztah thaJeztah approved these changes

+1 more reviewer

@dsseng dsseng dsseng left review comments

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
area/rootless Rootless Mode impact/changelog status/2-code-review
Projects
None yet
Milestone
19.03.7
Development

Successfully merging this pull request may close these issues.
4 participants
@AkihiroSuda @thaJeztah @cpuguy83 @dsseng
0