Fix paths when using CROSS_CONTAINER_IN_CONTAINER
#1483
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
|
/ci try -t cross |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
thirteenowls
force-pushed
the
fix-container-in-container-paths
branch
from
30c2218 to
c6e3316
Compare
|
I forgot about the changelog entry, sorry! |
|
/ci try -t cross |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
|
The Windows CI failure seems to be caused by a recent commit to Edit: Fixed in #1484. |
|
/ci try -t cross |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
|
oh yeah, it doesn't rebase to master, should fix that :3 |
thirteenowls
force-pushed
the
fix-container-in-container-paths
branch
from
c6e3316 to
109737f
Compare
|
/ci try -t cross |
This comment has been minimized.
This comment has been minimized.
Try run for comment
Successful Jobs
|
github-merge-queue bot
pushed a commit
that referenced
this pull request
May 6, 2024
Currently, `MountFinder` is used for almost all paths, rather than only for the host path in bind/volume mounts. Because of this, `docker build` invocations use the wrong working directory (`/var/lib/docker/.../workdir-path` instead of `/workdir-path`), causing failures for builds that use `pre-build` with a relative file path, and `docker run` invocations use incorrect `-v` arguments (e.g. `/var/lib/docker/.../toolchain-dir:/var/lib/docker/.../toolchain-dir` instead of `/var/lib/docker/.../toolchain-dir:/toolchain-dir`). This PR fixes those issues by only using `find_path` and `find_mount_path` when necessary.
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
Emilgardis
added
the
no-ci-targets
|
failure is unrelated |
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.
Currently,
MountFinderis used for almost all paths, rather than only for the host path in bind/volume mounts.Because of this,
docker buildinvocations use the wrong working directory (/var/lib/docker/.../workdir-pathinstead of/workdir-path), causing failures for builds that usepre-buildwith a relative file path, anddocker runinvocations use incorrect-varguments (e.g./var/lib/docker/.../toolchain-dir:/var/lib/docker/.../toolchain-dirinstead of/var/lib/docker/.../toolchain-dir:/toolchain-dir).This PR fixes those issues by only using
find_pathandfind_mount_pathwhen necessary.