Skip to content

fix(remount): ensure mountpoint is a file for files #249

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

Merged
merged 6 commits into from
Jun 26, 2024
Merged

fix(remount): ensure mountpoint is a file for files #249

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7ecee4a
fix(remount): create parent directory for files
maxbrunet Jun 25, 2024
51ba3ef
Camel case
maxbrunet Jun 25, 2024
dac4d24
Ensure file path exists
maxbrunet Jun 25, 2024
734cefc
RED: update integration tests to reproduce issue
johnstcn Jun 26, 2024
20c0145
take Options.IgnorePaths into account when temp-remounting
johnstcn Jun 26, 2024
60a700d
Only ignore LayerCacheDir if non-empty
maxbrunet Jun 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion envbuilder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,12 +394,15 @@ func Run(ctx context.Context, options Options) error {
// https://github.com/GoogleContainerTools/kaniko/blob/63be4990ca5a60bdf06ddc4d10aa4eca0c0bc714/cmd/executor/cmd/root.go#L136
ignorePaths := append([]string{
MagicDir,
options.LayerCacheDir,
options.WorkspaceFolder,
// See: https://github.com/coder/envbuilder/issues/37
"/etc/resolv.conf",
}, options.IgnorePaths...)

if options.LayerCacheDir != "" {
ignorePaths = append(ignorePaths, options.LayerCacheDir)
}
Comment on lines +402 to +404
Copy link
Member

Choose a reason for hiding this comment

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

ah, nice catch 👍

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hehe yes, it was ignoring everything 😅


for _, ignorePath := range ignorePaths {
util.AddToDefaultIgnoreList(util.IgnoreListEntry{
Path: ignorePath,
Expand Down