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.

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

docker: adjust capabilities on Windows #23599

Merged
merged 10 commits into from
Jul 17, 2024
Merged

docker: adjust capabilities on Windows #23599

merged 10 commits into from
Jul 17, 2024

Conversation

pkazmierczak
Copy link
Contributor

@pkazmierczak pkazmierczak commented Jul 16, 2024 •
edited
Loading

Adjusts Docker capabilities per OS, and checks for runtime on Windows.

Fixes #15181
Internal ref: https://hashicorp.atlassian.net/browse/NET-9506

@pkazmierczak pkazmierczak marked this pull request as ready for review July 16, 2024 17:43
@pkazmierczak pkazmierczak added this to the 1.8.x milestone Jul 16, 2024
@pkazmierczak pkazmierczak self-assigned this Jul 16, 2024
@pkazmierczak pkazmierczak added backport/ent/1.6.x+ent Changes are backported to 1.6.x+ent backport/ent/1.7.x+ent Changes are backported to 1.7.x+ent backport/ent/1.8.x+ent Changes are backported to 1.8.x+ent backport/1.8.x backport to 1.8.x release line theme/driver/docker theme/platform-windows labels Jul 16, 2024
@pkazmierczak pkazmierczak requested review from tgross and gulducat July 16, 2024 18:48
tgross
tgross approved these changes Jul 16, 2024
View reviewed changes
Copy link
Member

@tgross tgross left a comment

Choose a reason for hiding this comment

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

LGTM!

It's really unfortunate that Docker doesn't expose this default via the API (ex. their "system" API), as I'm sure at some point in the future they're going to change it again and break this behavior. But I can't think of a better way to handle it in the face of that, either, short of doing something silly-expensive like just running the container and retrying with a different set of caps if that fails.

drivers/shared/capabilities/defaults_windows.go Outdated Show resolved Hide resolved
drivers/docker/driver.go Outdated Show resolved Hide resolved
@pkazmierczak pkazmierczak merged commit f22ce92 into main Jul 17, 2024
19 checks passed
@pkazmierczak pkazmierczak deleted the b-docker-cap-drop branch July 17, 2024 07:01
@hc-github-team-nomad-core hc-github-team-nomad-core mentioned this pull request Jul 17, 2024
Merged
@github-actions GitHub Actions
Copy link

I'm going to lock this pull request because it has been closed for 120 days ⏳. This helps our maintainers find and focus on the active contributions.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Dec 28, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@tgross tgross tgross approved these changes

@gulducat gulducat Awaiting requested review from gulducat

Assignees

@pkazmierczak pkazmierczak

Labels
backport/ent/1.6.x+ent Changes are backported to 1.6.x+ent backport/ent/1.7.x+ent Changes are backported to 1.7.x+ent backport/ent/1.8.x+ent Changes are backported to 1.8.x+ent backport/1.8.x backport to 1.8.x release line theme/driver/docker theme/platform-windows
Projects
None yet
Milestone
1.8.x
Development

Successfully merging this pull request may close these issues.

Nomad fails to run a container with Docker-CE installed on Windows
2 participants
@pkazmierczak @tgross