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

Userns to driver #1368

Merged
merged 2 commits into from Oct 24, 2022
Merged

Userns to driver #1368

merged 2 commits into from Oct 24, 2022

Conversation

jedevc
Copy link
Collaborator

@jedevc jedevc commented Oct 21, 2022

Follow-up to #887 (see #887 (comment) for more context).

This resolves #1358, so that a docker-container builder can be created even in the absence of the socket - it shouldn't fail until it is started, either with --bootstrap or by attempting a build.

The issue that caused this flow to stop working was introduced in #1206, which was released in v0.9 - I wonder if it's worth cherry-picking?

Signed-off-by: Justin Chadwell <me@jedevc.com>
This moves the detection of the docker daemon's security options into
the driver from the factory, handling them in a similar way to how we do
cgroups.

Because of recent changes that modify error detection in driver
creation, this attempt to contact the docker daemon during builder
creation meant that a docker-container builder could not be created
without access to the docker socket. This patch resolves this, by
defering the Info call to the driver, when the container is actually
created.

Signed-off-by: Justin Chadwell <me@jedevc.com>
@AkihiroSuda
Copy link
Collaborator

(Eventually we should have CI to cover userns, but it can be another PR)

@crazy-max crazy-max merged commit c924a04 into docker:master Oct 24, 2022
@jedevc jedevc deleted the userns-to-driver branch October 24, 2022 08:22
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.

None yet

3 participants