Support rootless docker. #890
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Alexhuszagh
force-pushed
the
rootless
branch
2 times, most recently
from
7297d0d
to
c07045f
Compare
Emilgardis
reviewed
Jul 1, 2022
Alexhuszagh
force-pushed
the
rootless
branch
2 times, most recently
from
7946650
to
169f5a2
Compare
Emilgardis
requested changes
Jul 1, 2022
Alexhuszagh
force-pushed
the
rootless
branch
2 times, most recently
from
091dd87
to
86e9f83
Compare
Emilgardis
approved these changes
Jul 1, 2022
Adds support for rootless docker, and manually overriding rootless/rootful container engines through the `CROSS_ROOTLESS_CONTAINER_ENGINE` environment variable. If not set, it will use the default mode for the container engine (rootful for docker, rootless for everything else). ```bash \# use the defaults cross run ... \# auto-select if using rootless (the default) CROSS_ROOTLESS_CONTAINER_ENGINE=auto cross run ... \# always use rootful mode CROSS_ROOTLESS_CONTAINER_ENGINE=0 cross run ... \# always use rootless mode CROSS_ROOTLESS_CONTAINER_ENGINE=1 cross run ... ``` Closes cross-rs#889.
That would also be good, since we could move fn bool_or_default(var: &str) -> bool {
env::var(var)
.map(|s| bool_from_envvar(&s))
.unwrap_or_default()
}And this would cover basically every case. |
|
bors r=Emilgardis |
|
Build succeeded: |
github-merge-queue bot
pushed a commit
that referenced
this pull request
Dec 17, 2023
…ootless?" (#1380) I recently encountered #1098 and propose an iteration on the fix in #890 This patch adds a last minute check that looks up the current builder endpoint. This may be seen as a costly operation however, as mentioned in #889 Here's the output of `docker builder inspect` on my rootless install: ``` Name: rootless Driver: docker Last Activity: 2023-12-03 02:04:14 +0000 UTC Nodes: Name: rootless Endpoint: rootless # <= THIS HERE Status: running Buildkit: v0.11.7+d3e6c1360f6e Platforms: linux/amd64, linux/amd64/v2, linux/amd64/v3, linux/amd64/v4, linux/386 Labels: org.mobyproject.buildkit.worker.moby.host-gateway-ip: 172.17.0.1 ```
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds support for rootless docker, and manually overriding rootless/rootful container engines through the
CROSS_ROOTLESS_CONTAINER_ENGINEenvironment variable. If not set, it will use the default mode for the container engine (rootful for docker, rootless for everything else).Closes #889.